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.
This commit is contained in:
Daniel Stenberg 2005-04-24 22:25:04 +00:00
parent b8bc6bed97
commit a8ff0a21bf
5 changed files with 21 additions and 1 deletions

View File

@ -7,6 +7,10 @@
Changelog 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) Daniel (23 April 2005)
- Alex Suykov made the curl tool now assume that uploads using HTTP:// or - 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 HTTPS:// are the only ones that show output and thus motivates a switched

View File

@ -235,6 +235,10 @@
/* lber dynamic library file */ /* lber dynamic library file */
/* #undef DL_LBER_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 */ /* ldap dynamic library file */
#define DL_LDAP_FILE "wldap32.dll" #define DL_LDAP_FILE "wldap32.dll"

View File

@ -33,7 +33,11 @@
#endif #endif
#if !defined(WIN32) && defined(__WIN32__) #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 #define WIN32
#endif #endif

View File

@ -37,6 +37,10 @@
/* Define if you have the setlocale() function. */ /* Define if you have the setlocale() function. */
#define HAVE_SETLOCALE 1 #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.* * This section is for compiler specific defines.*
*************************************************/ *************************************************/

View File

@ -29,6 +29,10 @@
/* Borland fix */ /* Borland fix */
#define WIN32 #define WIN32
#endif #endif
#if !defined(WIN32) && defined(_WIN32)
/* This works for VS2005 on x64 */
#define WIN32
#endif
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" /* the configure script results */ #include "config.h" /* the configure script results */