Avoid race condition.

[oweals/openssl.git] / crypto / rand / rand.h

diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h
index 0bfccac18f7fcb3957edd248f85af2927e6071c4..918f865d90fadd1cdd8bb24a77367e7c29515d91 100644 (file)
--- a/crypto/rand/rand.h
+++ b/crypto/rand/rand.h
@@ -79,10 +79,8 @@ typedef struct rand_meth_st
 extern int rand_predictable;
 #endif
 
-struct engine_st;
-
-int RAND_set_rand_method(struct engine_st *meth);
-const RAND_METHOD *RAND_get_rand_method(void );
+void RAND_set_rand_method(RAND_METHOD *meth);
+RAND_METHOD *RAND_get_rand_method(void );
 RAND_METHOD *RAND_SSLeay(void);
 void RAND_cleanup(void );
 int  RAND_bytes(unsigned char *buf,int num);
@@ -93,34 +91,42 @@ int  RAND_load_file(const char *file,long max_bytes);
 int  RAND_write_file(const char *file);
 const char *RAND_file_name(char *file,size_t num);
 int RAND_status(void);
-int RAND_query_egd_bytes(const char *path, unsigned char *buf, int bytes);
 int RAND_egd(const char *path);
 int RAND_egd_bytes(const char *path,int bytes);
+void ERR_load_RAND_strings(void);
 int RAND_poll(void);
 
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
+#ifdef  __cplusplus
+}
+#endif
+
+#if defined(WINDOWS) || defined(WIN32)
+#include <windows.h>
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
 
 void RAND_screen(void);
 int RAND_event(UINT, WPARAM, LPARAM);
 
+#ifdef  __cplusplus
+}
+#endif
 #endif
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
-void ERR_load_RAND_strings(void);
 
 /* Error codes for the RAND functions. */
 
 /* Function codes. */
-#define RAND_F_RAND_GET_RAND_METHOD                     101
 #define RAND_F_SSLEAY_RAND_BYTES                        100
 
 /* Reason codes. */
 #define RAND_R_PRNG_NOT_SEEDED                          100
 
-#ifdef  __cplusplus
-}
-#endif
 #endif
+