e_os* corrections.

diff --git a/Makefile.org b/Makefile.org
index ef956d87f1dd3a9bf63f257eec3289d33a3d5b08..add58c249437f479e6475b37e7a7e82d1c0082cc 100644 (file)
--- a/Makefile.org
+++ b/Makefile.org
@@ -171,7 +171,7 @@ BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
 TARFILE=        $(NAME).tar
 WTARFILE=       $(NAME)-win.tar
-EXHEADER=       e_os.h
+EXHEADER=       e_os.h e_os2.h
 HEADER=         e_os.h
 
 all: Makefile.ssl
@@ -318,6 +318,11 @@ install: all
        @-mkdir -p $(INSTALL_PREFIX)$(OPENSSLDIR)/certs 2>/dev/null
        @-mkdir -p $(INSTALL_PREFIX)$(OPENSSLDIR)/private 2>/dev/null
        @-mkdir -p $(INSTALL_PREFIX)$(OPENSSLDIR)/lib 2>/dev/null
+       @for i in $(EXHEADER) ;\
+       do \
+       (cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
+       chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
+       done;
        @for i in $(DIRS) ;\
        do \
        (cd $$i; echo "installing $$i..."; \

diff --git a/e_os2.h b/e_os2.h
new file mode 100644 (file)
index 0000000..6f0c693
--- /dev/null
+++ b/e_os2.h
@@ -0,0 +1,40 @@
+/* e_os2.h */
+
+#ifndef HEADER_E_OS2_H
+#define HEADER_E_OS2_H
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+/* Definitions of OPENSSL_GLOBAL and OPENSSL_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 OPENSSL_EXTERN globalref
+# define OPENSSL_GLOBAL globaldef
+#else
+# define OPENSSL_EXTERN extern
+# define OPENSSL_GLOBAL
+#endif
+
+/* The above definitions should be used throughout the library,
+ * but as long as EXTERN and GLOBAL occur there, we keep the following
+ * definitions, too: */
+#if defined(VMS) && !defined(__DECC)
+# define EXTERN globalref
+# define GLOBAL globaldef
+#else
+# define EXTERN extern
+# define GLOBAL
+#endif
+
+
+#ifdef  __cplusplus
+}
+#endif
+#endif
+