define RFILE only in the file that needs it

3 files changed, 2 insertions, 11 deletions

diff --git a/src/lib/libcrypto/rand/randfile.c b/src/lib/libcrypto/rand/randfile.c
index 9ba103369f..c47d1f7224 100644
--- a/src/lib/libcrypto/rand/randfile.c
+++ b/src/lib/libcrypto/rand/randfile.c
@@ -74,7 +74,7 @@
 #define BUFSIZE 1024
 #define RAND_DATA 1024
 
-/* #define RFILE ".rnd" - defined in ../../e_os.h */
+#define RFILE           ".rnd"
 
 /* Note that these functions are intended for seed files only.
  * Entropy devices and EGD sockets are handled in rand_unix.c */
diff --git a/src/lib/libssl/src/crypto/rand/randfile.c b/src/lib/libssl/src/crypto/rand/randfile.c
index 9ba103369f..c47d1f7224 100644
--- a/src/lib/libssl/src/crypto/rand/randfile.c
+++ b/src/lib/libssl/src/crypto/rand/randfile.c
@@ -74,7 +74,7 @@
 #define BUFSIZE 1024
 #define RAND_DATA 1024
 
-/* #define RFILE ".rnd" - defined in ../../e_os.h */
+#define RFILE           ".rnd"
 
 /* Note that these functions are intended for seed files only.
  * Entropy devices and EGD sockets are handled in rand_unix.c */
diff --git a/src/lib/libssl/src/e_os.h b/src/lib/libssl/src/e_os.h
index 8efb7f234b..7de4dc09b3 100644
--- a/src/lib/libssl/src/e_os.h
+++ b/src/lib/libssl/src/e_os.h
@@ -70,18 +70,9 @@
 
 #include <openssl/e_os2.h>
 
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
 #define OPENSSL_CONF    "openssl.cnf"
-#define RFILE           ".rnd"
 
 #define OPENSSL_USE_IPV6 1
 
-#ifdef  __cplusplus
-}
-#endif
-
 #endif