e_os2.h is used for things that must be visible when external applications

use (certain parts of) OpenSSL.

diff --git a/e_os.h b/e_os.h
index 01a9c9402a7d91d5667fba0d6c937e733a403e6e..f480f6223e2c4c94ce1d3304229e623d75beb8ed 100644 (file)
--- a/e_os.h
+++ b/e_os.h
@@ -59,6 +59,11 @@
 #ifndef HEADER_E_OS_H
 #define HEADER_E_OS_H
 
+#include <openssl/e_os2.h>
+/* <openssl/e_os2.h> contains what we can justify to make visible
+ * to the outside.  e_os.h shouldn't even be in the include/openssl
+ * directory, these are just local definitions. */
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -242,17 +247,6 @@ extern "C" {
 
 #endif
 
-/* Definitions of GLOBAL and EXTERN, to define and declare certain global
-   symbols that, with some compilers under VMS, have to be defined and
-   declared explicitely with globaldef and globalref.  On other OS:es,
-   these macros are defined with something sensible. */
-#if defined(VMS) && !defined(__DECC)
-#define EXTERN globalref
-#define GLOBAL globaldef
-#else
-#define EXTERN extern
-#define GLOBAL
-#endif
 
 /*************/