diff options
| author | Andy Polyakov <appro@openssl.org> | 1999-12-26 22:46:49 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 1999-12-26 22:46:49 +0000 |
| commit | 76997b7dd0011e23fb5ed3a49aa693b1fc33bfb6 (patch) | |
| tree | 93c38a8daaad6522d309e10c0d1b7d5d69864de0 | |
| parent | e6f3c5850e64145eaecdcf44737e873530f7d37b (diff) | |
MacOS updates. Initial support for GUSI (MacOS socket implementation)
is added.
| -rw-r--r-- | MacOS/_MWERKS_prefix.h | 4 | ||||
| -rw-r--r-- | crypto/des/read_pwd.c | 4 | ||||
| -rw-r--r-- | e_os.h | 10 |
3 files changed, 13 insertions, 5 deletions
diff --git a/MacOS/_MWERKS_prefix.h b/MacOS/_MWERKS_prefix.h index 3e3fa30e85..2189da753b 100644 --- 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 ffa72be734..fa2d67da64 100644 --- 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. @@ -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 */ |