summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2005-04-24 22:25:04 +0000
committerDaniel Stenberg <daniel@haxx.se>2005-04-24 22:25:04 +0000
commita8ff0a21bf88f1cbfd6fa38683876dc95a96f1f3 (patch)
treeb31577c484fd869f1da90f930cd8ace5e574564e /src
parentb8bc6bed97358020963a4333077a12fa7f39fa61 (diff)
downloadcurl-a8ff0a21bf88f1cbfd6fa38683876dc95a96f1f3.tar.gz
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 'src')
-rw-r--r--src/config-win32.h4
-rw-r--r--src/setup.h4
2 files changed, 8 insertions, 0 deletions
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 */