From: Dr. Stephen Henson <steve@openssl.org>
Date: Sat, 12 May 2001 00:16:56 +0000 (+0000)
Subject: Under VC++ _DLL is set to indicate that the application
X-Git-Tag: OpenSSL_0_9_6c~182^2~185
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=595cc5b4b86327fba7bb0570294f7fb05987485b;p=oweals%2Fopenssl.git

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 1b71fba707..272faad39c 100644
--- 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