Commit 32195c67 authored by Yang Tse's avatar Yang Tse
Browse files

Define WIN32 when build target is Win32 API. 

This also defines it for WinCE even though it is a subset of WIN32.
parent b99a61c5

ares/ares.h

+8 −0
Original line number Diff line number Diff line
@@ -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__))

ares/ares_private.h

+8 −0
Original line number Diff line number Diff line
@@ -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>

ares/setup.h

+4 −6
Original line number Diff line number Diff line
@@ -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

include/curl/curl.h

+8 −6
Original line number Diff line number Diff line
@@ -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 <stdio.h>

#include <limits.h>
@@ -41,12 +49,6 @@ 
# include <time.h>

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

lib/setup.h

+4 −6
Original line number Diff line number Diff line
@@ -32,13 +32,11 @@ 
#define CURL_DISABLE_FILE

#endif /* HTTP_ONLY */



#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