Unverified Commit beb08481 authored by Marcel Raad's avatar Marcel Raad
Browse files

curl_setup: always define WIN32_LEAN_AND_MEAN on Windows 

Make sure to always define WIN32_LEAN_AND_MEAN before including any
Windows headers to avoid pulling in unnecessary headers. This avoids
unnecessary macro clashes and compiler warnings.

Ref: https://github.com/curl/curl/issues/1562
Closes https://github.com/curl/curl/pull/1672
parent c5e87fdb

include/curl/system.h

+0 −3
Original line number Diff line number Diff line
@@ -442,9 +442,6 @@ 
/* CURL_PULL_WS2TCPIP_H is defined above when inclusion of header file  */

/* ws2tcpip.h is required here to properly make type definitions below. */

#ifdef CURL_PULL_WS2TCPIP_H

#  ifndef WIN32_LEAN_AND_MEAN

#    define WIN32_LEAN_AND_MEAN

#  endif

#  include <windows.h>

#  include <winsock2.h>

#  include <ws2tcpip.h>

lib/curl_setup.h

+11 −3
Original line number Diff line number Diff line
@@ -31,6 +31,17 @@ 
#define WIN32

#endif



#ifdef WIN32

/*

 * Don't include unneeded stuff in Windows headers to avoid compiler

 * warnings and macro clashes.

 * Make sure to define this macro before including any Windows headers.

 */

#  ifndef WIN32_LEAN_AND_MEAN

#    define WIN32_LEAN_AND_MEAN

#  endif

#endif



/*

 * Include configuration script results or hand-crafted

 * configuration file for platforms which lack config tool.
@@ -237,9 +248,6 @@ 
#  if defined(_UNICODE) && !defined(UNICODE)

#    define UNICODE

#  endif

#  ifndef WIN32_LEAN_AND_MEAN

#    define WIN32_LEAN_AND_MEAN

#  endif

#  include <windows.h>

#  ifdef HAVE_WINSOCK2_H

#    include <winsock2.h>

winbuild/MakefileBuild.vc

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ CFLAGS = /I. /I../lib /I../include /nologo /W3 /GX /DWIN32 /YX /FD /c /DBUIL 
!ELSE

CC_NODEBUG  = $(CC) /O2 /DNDEBUG

CC_DEBUG    = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd /W3

CFLAGS      = /I. /I ../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL /DWIN32_LEAN_AND_MEAN

CFLAGS      = /I. /I ../lib /I../include /nologo /W3 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL

!ENDIF



LFLAGS     = /nologo /machine:$(MACHINE)