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.
This commit is contained in:
parent
29fb08c2de
commit
595cc5b4b8
1 changed files with 0 additions and 3 deletions
3
e_os2.h
3
e_os2.h
|
@ -121,9 +121,6 @@ extern "C" {
|
||||||
# if defined(_WINDLL) /* This is used when building OpenSSL to indicate that
|
# if defined(_WINDLL) /* This is used when building OpenSSL to indicate that
|
||||||
DLL linkage should be used */
|
DLL linkage should be used */
|
||||||
# define OPENSSL_OPT_WINDLL
|
# 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
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue