diff options
author | Daniel Stenberg <daniel@haxx.se> | 2005-04-24 22:25:04 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2005-04-24 22:25:04 +0000 |
commit | a8ff0a21bf88f1cbfd6fa38683876dc95a96f1f3 (patch) | |
tree | b31577c484fd869f1da90f930cd8ace5e574564e /lib | |
parent | b8bc6bed97358020963a4333077a12fa7f39fa61 (diff) |
Based on feedback from Cory Nelson, I added some preprocessor magic in
*/setup.h and */config-win32.h to build fine with VS2005 on x64.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/config-win32.h | 4 | ||||
-rw-r--r-- | lib/setup.h | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/config-win32.h b/lib/config-win32.h index e17ef98ae..3a6f65716 100644 --- a/lib/config-win32.h +++ b/lib/config-win32.h @@ -235,6 +235,10 @@ /* lber dynamic library file */ /* #undef DL_LBER_FILE */ +/* Defines set for VS2005 to _not_ decprecate a few functions we use. */ +#define _CRT_SECURE_NO_DEPRECATE +#define _CRT_NONSTDC_NO_DEPRECATE + /* ldap dynamic library file */ #define DL_LDAP_FILE "wldap32.dll" diff --git a/lib/setup.h b/lib/setup.h index b44e777c9..bf3a9aad3 100644 --- a/lib/setup.h +++ b/lib/setup.h @@ -33,7 +33,11 @@ #endif #if !defined(WIN32) && defined(__WIN32__) -/* This should be a good Borland fix. Alexander J. Oss told us! */ +/* This should be a good Borland fix. */ +#define WIN32 +#endif +#if !defined(WIN32) && defined(_WIN32) +/* This works for VS2005 on x64 */ #define WIN32 #endif |