Define WIN32 when build target is Win32 API.

This also defines it for WinCE even though it is a subset of WIN32.
17 years ago · 7cd35ce698
parent aa74d21c4e
commit 7cd35ce698
3 changed files with 20 additions and 6 deletions
--- 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__))
--- 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>

--- 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