diff options
| author | Andy Polyakov <appro@openssl.org> | 1999-12-19 21:35:29 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 1999-12-19 21:35:29 +0000 |
| commit | a7c5241f5f23bf8eeb41efd7f4932f9e1359a38d (patch) | |
| tree | 91faf211edc31118dc5f7c5e897806a7ba70f9bb /crypto | |
| parent | 099f1b32c8a3334699b6884ba23824a49461d01f (diff) | |
| download | openssl-a7c5241f5f23bf8eeb41efd7f4932f9e1359a38d.tar.gz | |
Late break-in patch for MacOS support.
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/cryptlib.c | 2 | ||||
| -rw-r--r-- | crypto/md32_common.h | 3 | ||||
| -rw-r--r-- | crypto/mem.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/crypto/cryptlib.c b/crypto/cryptlib.c index 5142b6b6bf..a8f29f1e65 100644 --- a/crypto/cryptlib.c +++ b/crypto/cryptlib.c @@ -183,7 +183,7 @@ unsigned long CRYPTO_thread_id(void) ret=(unsigned long)GetCurrentTask(); #elif defined(WIN32) ret=(unsigned long)GetCurrentThreadId(); -#elif defined(MSDOS) +#elif defined(GETPID_IS_MEANINGLESS) ret=1L; #else ret=(unsigned long)getpid(); diff --git a/crypto/md32_common.h b/crypto/md32_common.h index 8d9059f95a..470a8c3e51 100644 --- a/crypto/md32_common.h +++ b/crypto/md32_common.h @@ -183,11 +183,10 @@ # define ROTATE(a,n) _lrotl(a,n) # elif defined(__MWERKS__) # ifdef __POWERPC__ -# defined ROTATE(a,n) __rlwinm(a,n,0,31) +# define ROTATE(a,n) __rlwinm(a,n,0,31) # else # define ROTATE(a,n) __rol(a,n) # endif - B # elif defined(__GNUC__) && __GNUC__>=2 && !defined(NO_ASM) /* * Some GNU C inline assembler templates. Note that these are diff --git a/crypto/mem.c b/crypto/mem.c index a9529ee274..67f8d12cc0 100644 --- a/crypto/mem.c +++ b/crypto/mem.c @@ -93,7 +93,7 @@ static void (*free_func)(void *) = free; static void (*realloc_debug_func)()= NULL; static void (*free_debug_func)()= NULL; static void (*set_debug_options_func)()= NULL; - static int (*get_debug_options_func)()= NULL; + static long (*get_debug_options_func)()= NULL; #endif |