Under VC++ _DLL is set to indicate that the application

will be linked against the DLL runtime library. It is
automatically set when /MD is used.

As a result OpenSSL shouldn't use _DLL to determine if
it should set OPENSSL_OPT_WINDLL because this will
cause linkage conflicts with static builds which do
include the /MD compiler switch.

diff --git a/e_os2.h b/e_os2.h
index 1b71fba7077592b7f4809dce0e28b32b816a29ad..272faad39cc0ba3579e405176e55eb3b59aab099 100644 (file)
--- a/e_os2.h
+++ b/e_os2.h
@@ -121,9 +121,6 @@ extern "C" {
 #  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