Add the possibility for option macros and start using it to indicate
for Windows compilations if DLL linkage is required or not.
diff --git a/e_os2.h b/e_os2.h
index f279fa1..ed90f22 100644
--- a/e_os2.h
+++ b/e_os2.h
@@ -113,6 +113,21 @@
# endif
#endif
+/* DLL settings. This part is a bit tough, because it's up to the application
+ implementor how he or she will link the application, so it requires some
+ macro to be used. */
+#ifdef OPENSSL_SYS_WINDOWS
+# ifndef OPENSSL_OPT_WINDLL
+# if defined(_WINDLL) /* This is used when building OpenSSL to indicate that
+ DLL linkage should be used */
+# define OPENSSL_OPT_WINDLL
+# elif defined(_DLL) /* This one is used quite much in the VC++ header
+ files */
+# define OPENSSL_OPT_WINDLL
+# endif
+# endif
+#endif
+
/* -------------------------------- OpenVMS -------------------------------- */
#if defined(__VMS) || defined(VMS) || defined(OPENSSL_SYSNAME_VMS)
# undef OPENSSL_SYS_UNIX
@@ -189,7 +204,7 @@
# define OPENSSL_EXPORT globalref
# define OPENSSL_IMPORT globalref
# define OPENSSL_GLOBAL globaldef
-#elif defined(OPENSSL_SYS_WINDOWS)
+#elif defined(OPENSSL_SYS_WINDOWS) && defined(OPENSSL_OPT_WINDLL)
# define OPENSSL_EXPORT extern _declspec(dllexport)
# define OPENSSL_IMPORT extern _declspec(dllimport)
# define OPENSSL_GLOBAL
