summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2007-11-08 18:13:54 (GMT)
committerYang Tse <yangsita@gmail.com>2007-11-08 18:13:54 (GMT)
commit7cd35ce69858bb06a446ef7620ea52807d67d306 (patch)
tree859f6581d29eaaf956fc2a795387d9531743888c
parentaa74d21c4e5da1c8650115ec3c062d31f37ea370 (diff)
downloadc-ares-7cd35ce69858bb06a446ef7620ea52807d67d306.zip
c-ares-7cd35ce69858bb06a446ef7620ea52807d67d306.tar.gz
c-ares-7cd35ce69858bb06a446ef7620ea52807d67d306.tar.bz2
Define WIN32 when build target is Win32 API.
This also defines it for WinCE even though it is a subset of WIN32.
-rw-r--r--ares.h8
-rw-r--r--ares_private.h8
-rw-r--r--setup.h10
3 files changed, 20 insertions, 6 deletions
diff --git a/ares.h b/ares.h
index 4437e3d..af7df70 100644
--- a/ares.h
+++ b/ares.h
@@ -18,6 +18,14 @@
#ifndef ARES__H
#define ARES__H
+/*
+ * Define WIN32 when build target is Win32 API
+ */
+
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+#define WIN32
+#endif
+
#include <sys/types.h>
#if defined(_AIX) || (defined(NETWARE) && defined(__NOVELL_LIBC__))
diff --git a/ares_private.h b/ares_private.h
index 26f55db..d5ffbb3 100644
--- a/ares_private.h
+++ b/ares_private.h
@@ -18,6 +18,14 @@
* without express or implied warranty.
*/
+/*
+ * Define WIN32 when build target is Win32 API
+ */
+
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
+#define WIN32
+#endif
+
#include <stdio.h>
#include <sys/types.h>
diff --git a/setup.h b/setup.h
index 29e5d0f..70b8ecb 100644
--- a/setup.h
+++ b/setup.h
@@ -16,13 +16,11 @@
* without express or implied warranty.
*/
-#if !defined(WIN32) && defined(__WIN32__)
-/* Borland fix */
-#define WIN32
-#endif
+/*
+ * Define WIN32 when build target is Win32 API
+ */
-#if !defined(WIN32) && defined(_WIN32)
-/* VS2005 on x64 fix */
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
#define WIN32
#endif