make error tables const and separate header file

[openssl.git] / include / openssl / rand.h

diff --git a/include/openssl/rand.h b/include/openssl/rand.h
index 582a9b74911ba4d1b9594d420763bb634d521791..157d1ef916783db14e8ddc53231c418b3b831995 100644 (file)
--- a/include/openssl/rand.h
+++ b/include/openssl/rand.h
@@ -13,10 +13,7 @@
 # include <stdlib.h>
 # include <openssl/ossl_typ.h>
 # include <openssl/e_os2.h>
-
-# if defined(OPENSSL_SYS_WINDOWS)
-#  include <windows.h>
-# endif
+# include <openssl/randerr.h>
 
 #ifdef  __cplusplus
 extern "C" {
@@ -65,41 +62,15 @@ int RAND_egd_bytes(const char *path, int bytes);
 # endif
 int RAND_poll(void);
 
-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
-
-void RAND_screen(void);
-int RAND_event(UINT, WPARAM, LPARAM);
-
-# 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_FIPS_RAND                                 102
-# define RAND_F_FIPS_RAND_SET_DT                          103
-# define RAND_F_FIPS_SET_PRNG_SEED                        104
-# define RAND_F_FIPS_SET_TEST_MODE                        105
-# define RAND_F_FIPS_X931_SET_DT                          106
-# define RAND_F_RAND_BYTES                                100
-# define RAND_F_RAND_GET_RAND_METHOD                      101
+#if defined(_WIN32) && (defined(BASETYPES) || defined(_WINDEF_H))
+/* application has to include <windows.h> in order to use these */
+DEPRECATEDIN_1_1_0(void RAND_screen(void))
+DEPRECATEDIN_1_1_0(int RAND_event(UINT, WPARAM, LPARAM))
+#endif
 
-/* Reason codes. */
-# define RAND_R_NOT_IN_TEST_MODE                          101
-# define RAND_R_NO_KEY_SET                                102
-# define RAND_R_PRNG_ERROR                                103
-# define RAND_R_PRNG_KEYED                                104
-# define RAND_R_PRNG_NOT_SEEDED                           100
-# define RAND_R_PRNG_SEED_MUST_NOT_MATCH_KEY              105
-# define RAND_R_PRNG_STUCK                                106
+int ERR_load_RAND_strings(void);
 
-#ifdef  __cplusplus
+# ifdef  __cplusplus
 }
-#endif
+# endif
 #endif