MacOS updates. Initial support for GUSI (MacOS socket implementation)

is added.

diff --git a/MacOS/_MWERKS_prefix.h b/MacOS/_MWERKS_prefix.h
index 3e3fa30e85276c8f30d9cfa7bbf14fc504cde50c..2189da753bfaf3eda48ffce0f811c424209d5d9d 100644 (file)
--- a/MacOS/_MWERKS_prefix.h
+++ b/MacOS/_MWERKS_prefix.h
@@ -3,3 +3,7 @@
 #ifdef __POWERPC__
 #pragma longlong on
 #endif
+#if 0
+#define MAC_OS_GUSI_SOURCE
+#endif
+#define MONOLITH

diff --git a/crypto/des/read_pwd.c b/crypto/des/read_pwd.c
index ffa72be7348b172346fe35100a093f20150ac85e..fa2d67da643f11de4a55dbd2d94306d89b3025a6 100644 (file)
--- a/crypto/des/read_pwd.c
+++ b/crypto/des/read_pwd.c
@@ -127,7 +127,7 @@
 #undef  SGTTY
 #endif
 
-#if !defined(TERMIO) && !defined(TERMIOS) && !defined(VMS) && !defined(MSDOS) && !defined(MAC_OS_pre_X)
+#if !defined(TERMIO) && !defined(TERMIOS) && !defined(VMS) && !defined(MSDOS) && !defined(MAC_OS_pre_X) && !defined(MAC_OS_GUSI_SOURCE)
 #undef  TERMIOS
 #undef  TERMIO
 #define SGTTY
@@ -178,7 +178,7 @@ struct IOSB {
        };
 #endif
 
-#ifdef MAC_OS_pre_X
+#if defined(MAC_OS_pre_X) || defined(MAC_OS_GUSI_SOURCE)
 /*
  * This one needs work. As a matter of fact the code is unoperational
  * and this is only a trick to get it compiled.

diff --git a/e_os.h b/e_os.h
index f651b32fd5636d5b5b3275c3f925228b5e7cbd45..fa2a117762b7ef1519cdfeddbb752cd0513861e9 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -84,8 +84,11 @@ extern "C" {
 
 #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
@@ -249,6 +252,7 @@ extern "C" {
                                      __VMS_EXIT |= 0x10000000; \
                                     return(n); } while(0)
 #    endif
+#    define NO_SYS_PARAM_H
 #  else
      /* !defined VMS */
 #    ifdef OPENSSL_UNISTD
@@ -307,7 +311,7 @@ extern HINSTANCE _hInstance;
 
 #  else
 
-#    ifndef VMS
+#    ifndef NO_SYS_PARAM_H
 #      include <sys/param.h>
 #    endif
 #    include <sys/time.h> /* Needed under linux for FD_XXX */