diff options
author | Rich Salz <rsalz@openssl.org> | 2015-01-23 11:58:26 -0500 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2015-01-23 11:58:26 -0500 |
commit | 68b00c237298b2e7e382686ffd583847d57bbc0b (patch) | |
tree | f0728a99d3d978a6268e715564401ae68e65167b /crypto/rand | |
parent | 9b05cbc33e7895ed033b1119e300782d9e0cf23c (diff) |
ifdef cleanup part 3: OPENSSL_SYSNAME
Rename OPENSSL_SYSNAME_xxx to OPENSSL_SYS_xxx
Remove MS_STATIC; it's a relic from platforms <32 bits.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/rand')
-rw-r--r-- | crypto/rand/md_rand.c | 4 | ||||
-rw-r--r-- | crypto/rand/randfile.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/rand/md_rand.c b/crypto/rand/md_rand.c index 70743e1162..ef43966814 100644 --- a/crypto/rand/md_rand.c +++ b/crypto/rand/md_rand.c @@ -121,7 +121,7 @@ #include "e_os.h" -#if !(defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYSNAME_DSPBIOS)) +#if !(defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_VXWORKS) || defined(OPENSSL_SYS_DSPBIOS)) # include <sys/time.h> #endif #if defined(OPENSSL_SYS_VXWORKS) @@ -383,7 +383,7 @@ static int ssleay_rand_bytes(unsigned char *buf, int num, int pseudo) #elif defined(OPENSSL_SYS_VXWORKS) struct timespec tv; clock_gettime(CLOCK_REALTIME, &ts); -#elif defined(OPENSSL_SYSNAME_DSPBIOS) +#elif defined(OPENSSL_SYS_DSPBIOS) unsigned long long tv, OPENSSL_rdtsc(); tv = OPENSSL_rdtsc(); #else diff --git a/crypto/rand/randfile.c b/crypto/rand/randfile.c index b234be0df5..e15464651c 100644 --- a/crypto/rand/randfile.c +++ b/crypto/rand/randfile.c @@ -118,7 +118,7 @@ int RAND_load_file(const char *file, long bytes) * if bytes == -1, read complete file. */ - MS_STATIC unsigned char buf[BUFSIZE]; + unsigned char buf[BUFSIZE]; #ifndef OPENSSL_NO_POSIX_IO struct stat sb; #endif |