diff options
| author | Yang Tse <yangsita@gmail.com> | 2007-11-08 18:13:54 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2007-11-08 18:13:54 +0000 |
| commit | 32195c673de46a48457709bd4efa5c63525e1d68 (patch) | |
| tree | 127f45b0db924c1c56b613c321f3428a880c1254 /ares | |
| parent | b99a61c5b046d1a9b2c5f2e071233bb9c0458210 (diff) | |
Define WIN32 when build target is Win32 API.
This also defines it for WinCE even though it is a subset of WIN32.
Diffstat (limited to 'ares')
| -rw-r--r-- | ares/ares.h | 8 | ||||
| -rw-r--r-- | ares/ares_private.h | 8 | ||||
| -rw-r--r-- | ares/setup.h | 10 |
3 files changed, 20 insertions, 6 deletions
diff --git a/ares/ares.h b/ares/ares.h index 4437e3d3a..af7df703d 100644 --- a/ares/ares.h +++ b/ares/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/ares_private.h b/ares/ares_private.h index 26f55db5a..d5ffbb382 100644 --- a/ares/ares_private.h +++ b/ares/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/ares/setup.h b/ares/setup.h index 29e5d0f1f..70b8ecb0a 100644 --- a/ares/setup.h +++ b/ares/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 |