Move the definition of DEVRANDOM for DJGPP from Configure to e_os.h.
authorRichard Levitte <levitte@openssl.org>
Sat, 18 Jun 2005 04:42:24 +0000 (04:42 +0000)
committerRichard Levitte <levitte@openssl.org>
Sat, 18 Jun 2005 04:42:24 +0000 (04:42 +0000)
That should solve the issues with propagating it through the Makefiles.

PR: 1110

Configure
crypto/rand/rand_unix.c
e_os.h

index 934d36f..e123093 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -493,7 +493,7 @@ my %table=(
 "netware-libc-gcc", "i586-netware-gcc:-nostdinc -I/ndk/libc/include -I/ndk/libc/include/winsock -DL_ENDIAN -DNETWARE_LIBC -DOPENSSL_SYSNAME_NETWARE -DTERMIO -O2 -Wall:::::BN_LLONG ${x86_gcc_opts}::",
 
 # DJGPP
-"DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall -DDEVRANDOM=\"/dev/urandom\\x24\":::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:",
+"DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall:::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:",
 
 # Ultrix from Bernhard Simon <simon@zid.tuwien.ac.at>
 "ultrix-cc","cc:-std1 -O -Olimit 2500 -DL_ENDIAN::(unknown):::::::",
index bf9a0e9..14837a7 100644 (file)
@@ -153,7 +153,7 @@ int RAND_poll(void)
        int n = 0;
 #endif
 #ifdef DEVRANDOM
-       static const char *randomfiles[] = { "DEVRANDOM" };
+       static const char *randomfiles[] = { DEVRANDOM };
        struct stat randomstats[sizeof(randomfiles)/sizeof(randomfiles[0])];
        int fd,i;
 #endif
diff --git a/e_os.h b/e_os.h
index 06e1fe2..4d5e9f9 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -227,6 +227,7 @@ extern "C" {
 #    define _setmode setmode
 #    define _O_TEXT O_TEXT
 #    define _O_BINARY O_BINARY
+#    define DEVRANDOM "/dev/urandom\x24"
 #  endif /* __DJGPP__ */
 
 #  ifndef S_IFDIR