From 32195c673de46a48457709bd4efa5c63525e1d68 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Thu, 8 Nov 2007 18:13:54 +0000 Subject: Define WIN32 when build target is Win32 API. This also defines it for WinCE even though it is a subset of WIN32. --- include/curl/curl.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/curl/curl.h b/include/curl/curl.h index a29476017..79ea49752 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -29,6 +29,14 @@ #include "curlver.h" /* the libcurl version defines */ +/* + * Define WIN32 when build target is Win32 API + */ + +#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32) +#define WIN32 +#endif + #include #include @@ -41,12 +49,6 @@ # include #endif /* defined (vms) */ -#if defined(_WIN32) && !defined(WIN32) -/* Chris Lewis mentioned that he doesn't get WIN32 defined, only _WIN32 so we - make this adjustment to catch this. */ -#define WIN32 1 -#endif - #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__GNUC__) && \ !defined(__CYGWIN__) || defined(__MINGW32__) #if !(defined(_WINSOCKAPI_) || defined(_WINSOCK_H)) -- cgit v1.2.3