This is the first of two commits (didn't want to dump them all into the

[openssl.git] / e_os.h

diff --git a/e_os.h b/e_os.h
index f5bcceb8acc89ec4027e0346714bbd4184440cfc..aca01cdc644c1875664b901a3c4b80ebf5d74d36 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -87,6 +87,7 @@ extern "C" {
 #  ifndef MAC_OS_GUSI_SOURCE
 #    define MAC_OS_pre_X
 #    define NO_SYS_TYPES_H
+     typedef long ssize_t;
 #  endif
 #  define NO_SYS_PARAM_H
 #  define NO_CHMOD
@@ -194,9 +195,7 @@ extern "C" {
 #  include <io.h>
 #  include <fcntl.h>
 
-#  ifdef __MINGW32__
-#    define ssize_t long
-#  endif
+#  define ssize_t long
 
 #  if defined (__BORLANDC__)
 #    define _setmode setmode
@@ -392,12 +391,22 @@ extern HINSTANCE _hInstance;
 #  endif
 #endif
 
+#if defined(__ultrix)
+#  ifndef ssize_t
+#    define ssize_t int 
+#  endif
+#endif
+
 #if defined(THREADS) || defined(sun)
 #ifndef _REENTRANT
 #define _REENTRANT
 #endif
 #endif
 
+#if defined(sun) && !defined(__svr4__) && !defined(__SVR4)
+#define memmove(s1,s2,b) bcopy((s2),(s1),(n))
+#endif
+
 /***********************************************/
 
 /* do we need to do this for getenv.