projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
The des_xcbc_encrypt apparently always fails.
[openssl.git]
/
e_os.h
diff --git
a/e_os.h
b/e_os.h
index 0c4fcf87411c8d6adadbaac3c72bbf60c1764551..d23ab54aaf18b4591a7d2fd9e77ad306107a2861 100644
(file)
--- a/
e_os.h
+++ b/
e_os.h
@@
-84,8
+84,11
@@
extern "C" {
#if defined(__MWERKS__) && defined(macintosh)
# if macintosh==1
#if defined(__MWERKS__) && defined(macintosh)
# if macintosh==1
-# define MAC_OS_pre_X
-# define NO_SYS_TYPES_H
+# ifndef MAC_OS_GUSI_SOURCE
+# define MAC_OS_pre_X
+# define NO_SYS_TYPES_H
+# endif
+# define NO_SYS_PARAM_H
# define NO_CHMOD
# define NO_SYSLOG
# undef DEVRANDOM
# define NO_CHMOD
# define NO_SYSLOG
# undef DEVRANDOM
@@
-104,6
+107,10
@@
extern "C" {
# define MS_STATIC
#endif
# define MS_STATIC
#endif
+#if defined(_WIN32) && !defined(WIN32)
+# define WIN32
+#endif
+
#if defined(WIN32) || defined(WIN16)
# ifndef WINDOWS
# define WINDOWS
#if defined(WIN32) || defined(WIN16)
# ifndef WINDOWS
# define WINDOWS
@@
-249,9
+256,14
@@
extern "C" {
__VMS_EXIT |= 0x10000000; \
return(n); } while(0)
# endif
__VMS_EXIT |= 0x10000000; \
return(n); } while(0)
# endif
+# define NO_SYS_PARAM_H
# else
/* !defined VMS */
# else
/* !defined VMS */
-# include OPENSLL_UNISTD
+# ifdef OPENSSL_UNISTD
+# include OPENSSL_UNISTD
+# else
+# include <unistd.h>
+# endif
# ifndef NO_SYS_TYPES_H
# include <sys/types.h>
# endif
# ifndef NO_SYS_TYPES_H
# include <sys/types.h>
# endif
@@
-303,7
+315,7
@@
extern HINSTANCE _hInstance;
# else
# else
-# ifndef
VMS
+# ifndef
NO_SYS_PARAM_H
# include <sys/param.h>
# endif
# include <sys/time.h> /* Needed under linux for FD_XXX */
# include <sys/param.h>
# endif
# include <sys/time.h> /* Needed under linux for FD_XXX */