From: deraadt <deraadt@openbsd.org>
Date: Fri, 18 Apr 2014 11:31:16 +0000 (+0000)
Subject: define RFILE only in the file that needs it
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ac1c707a32edb41ed0ae4aabd7123bce78c8bf93;p=openbsd

define RFILE only in the file that needs it
---

diff --git a/lib/libcrypto/rand/randfile.c b/lib/libcrypto/rand/randfile.c
index 9ba103369fa..c47d1f72241 100644
--- a/lib/libcrypto/rand/randfile.c
+++ b/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/lib/libssl/src/crypto/rand/randfile.c b/lib/libssl/src/crypto/rand/randfile.c
index 9ba103369fa..c47d1f72241 100644
--- a/lib/libssl/src/crypto/rand/randfile.c
+++ b/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/lib/libssl/src/e_os.h b/lib/libssl/src/e_os.h
index 8efb7f234b5..7de4dc09b31 100644
--- a/lib/libssl/src/e_os.h
+++ b/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