diff options
author | Richard Levitte <levitte@openssl.org> | 2001-02-20 08:13:47 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2001-02-20 08:13:47 +0000 |
commit | bc36ee6227517edae802bcb0da68d4f04fe1fb5e (patch) | |
tree | 19782c56cd5f5930807df5c8bfb4963a05121c48 /crypto/rand | |
parent | f2bc668429fa2abdc77db0db861a9bb2be0c3a85 (diff) |
Use new-style system-id macros everywhere possible. I hope I haven't
missed any.
This compiles and runs on Linux, and external applications have no
problems with it. The definite test will be to build this on VMS.
Diffstat (limited to 'crypto/rand')
-rw-r--r-- | crypto/rand/md_rand.c | 2 | ||||
-rw-r--r-- | crypto/rand/rand_egd.c | 2 | ||||
-rw-r--r-- | crypto/rand/rand_unix.c | 2 | ||||
-rw-r--r-- | crypto/rand/rand_vms.c | 2 | ||||
-rw-r--r-- | crypto/rand/rand_win.c | 2 | ||||
-rw-r--r-- | crypto/rand/randfile.c | 10 |
6 files changed, 10 insertions, 10 deletions
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c index 378d59c4c8..3900bfeec3 100644 --- a/crypto/rand/md_rand.c +++ b/crypto/rand/md_rand.c @@ -294,7 +294,7 @@ static void ssleay_rand_add(const void *buf, int num, double add) entropy += add; if (!add_do_not_lock) CRYPTO_w_unlock(CRYPTO_LOCK_RAND); -#if !defined(OPENSSL_THREADS) && !defined(WIN32) +#if !defined(OPENSSL_THREADS) && !defined(OPENSSL_SYS_WIN32) assert(md_c[1] == md_count[1]); #endif } diff --git a/crypto/rand/rand_egd.c b/crypto/rand/rand_egd.c index 38816f8e07..c4b8bae2ed 100644 --- a/crypto/rand/rand_egd.c +++ b/crypto/rand/rand_egd.c @@ -93,7 +93,7 @@ * RAND_egd() is a wrapper for RAND_egd_bytes() with numbytes=255. */ -#if defined(WIN32) || defined(VMS) || defined(__VMS) +#if defined(OPENSSL_SYS_WIN32) || defined(VMS) || defined(__VMS) int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes) { return(-1); diff --git a/crypto/rand/rand_unix.c b/crypto/rand/rand_unix.c index 8e48561354..63b5efc32c 100644 --- a/crypto/rand/rand_unix.c +++ b/crypto/rand/rand_unix.c @@ -113,7 +113,7 @@ #include <openssl/rand.h> #include "rand_lcl.h" -#if !(defined(WINDOWS) || defined(WIN32) || defined(VMS)) +#if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VMS)) #include <sys/types.h> #include <sys/time.h> diff --git a/crypto/rand/rand_vms.c b/crypto/rand/rand_vms.c index 9c1dea0870..5e2e2b157b 100644 --- a/crypto/rand/rand_vms.c +++ b/crypto/rand/rand_vms.c @@ -59,7 +59,7 @@ #include <openssl/rand.h> #include "rand_lcl.h" -#if defined(VMS) +#if defined(OPENSSL_SYS_VMS) /* For now, this does nothing. I'm searching for a good random device, then we'll see. */ diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c index 56558c4f15..a688467e02 100644 --- a/crypto/rand/rand_win.c +++ b/crypto/rand/rand_win.c @@ -113,7 +113,7 @@ #include <openssl/rand.h> #include "rand_lcl.h" -#if defined(WINDOWS) || defined(WIN32) +#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) #include <windows.h> #ifndef _WIN32_WINNT # define _WIN32_WINNT 0x0400 diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index 0a4005bd4e..9ccf4663cb 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -61,7 +61,7 @@ #include <stdlib.h> #include <string.h> -#ifdef VMS +#ifdef OPENSSL_SYS_VMS #include <unixio.h> #endif #ifndef NO_SYS_TYPES_H @@ -136,7 +136,7 @@ int RAND_write_file(const char *file) FILE *out = NULL; int n; -#if defined(O_CREAT) && !defined(WIN32) +#if defined(O_CREAT) && !defined(OPENSSL_SYS_WIN32) /* For some reason Win32 can't write to files created this way */ /* chmod(..., 0600) is too late to protect the file, @@ -168,7 +168,7 @@ int RAND_write_file(const char *file) ret+=i; if (n <= 0) break; } -#ifdef VMS +#ifdef OPENSSL_SYS_VMS /* Try to delete older versions of the file, until there aren't any */ { @@ -186,7 +186,7 @@ int RAND_write_file(const char *file) some point... */ } } -#endif /* VMS */ +#endif /* OPENSSL_SYS_VMS */ fclose(out); memset(buf,0,BUFSIZE); @@ -214,7 +214,7 @@ const char *RAND_file_name(char *buf, int size) if (s != NULL && (strlen(s)+strlen(RFILE)+2 < size)) { strcpy(buf,s); -#ifndef VMS +#ifndef OPENSSL_SYS_VMS strcat(buf,"/"); #endif strcat(buf,RFILE); |