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 | |
| 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.
| -rw-r--r-- | CHANGES | 4 | ||||
| -rw-r--r-- | lib/config-win32.h | 4 | ||||
| -rw-r--r-- | lib/setup.h | 6 | ||||
| -rw-r--r-- | src/config-win32.h | 4 | ||||
| -rw-r--r-- | src/setup.h | 4 |
5 files changed, 21 insertions, 1 deletions
@@ -7,6 +7,10 @@ Changelog +Daniel (25 April 2005) +- 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. + Daniel (23 April 2005) - Alex Suykov made the curl tool now assume that uploads using HTTP:// or HTTPS:// are the only ones that show output and thus motivates a switched 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 diff --git a/src/config-win32.h b/src/config-win32.h index c07c349e5..e6dde29d1 100644 --- a/src/config-win32.h +++ b/src/config-win32.h @@ -37,6 +37,10 @@ /* Define if you have the setlocale() function. */ #define HAVE_SETLOCALE 1 +/* Defines set for VS2005 to _not_ decprecate a few functions we use. */ +#define _CRT_SECURE_NO_DEPRECATE +#define _CRT_NONSTDC_NO_DEPRECATE + /************************************************* * This section is for compiler specific defines.* *************************************************/ diff --git a/src/setup.h b/src/setup.h index b9b2283d0..3b6df3d8e 100644 --- a/src/setup.h +++ b/src/setup.h @@ -29,6 +29,10 @@ /* Borland fix */ #define WIN32 #endif +#if !defined(WIN32) && defined(_WIN32) +/* This works for VS2005 on x64 */ +#define WIN32 +#endif #ifdef HAVE_CONFIG_H #include "config.h" /* the configure script results */ |