]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
winbuild: remove outdated WIN32 defines
authorJay Satiro <raysatiro@yahoo.com>
Wed, 22 May 2024 06:46:13 +0000 (02:46 -0400)
committerJay Satiro <raysatiro@yahoo.com>
Fri, 24 May 2024 07:23:14 +0000 (03:23 -0400)
- Remove all instances in the makefile of compiler option /DWIN32.

This is a follow-up to e9a7d4a1 which replaced all defined(WIN32) checks
with defined(_WIN32) in the codebase, since only the latter is
automatically defined by all compilers for Windows builds.

Bug: https://github.com/curl/curl/pull/13739#issuecomment-2123937859
Reported-by: Viktor Szakats
Closes https://github.com/curl/curl/pull/13742

winbuild/MakefileBuild.vc

index 0d0a51623c4bd68c194b74ee932ac0e3882fda26..6b8c6ceb10b95b2e15e3095b7adeab26012a1754 100644 (file)
@@ -48,11 +48,11 @@ CC = cl.exe
 !IF "$(VC)"=="6"\r
 CC_NODEBUG  = $(CC) /O2 /DNDEBUG\r
 CC_DEBUG    = $(CC) /Od /Gm /Zi /D_DEBUG /GZ\r
-CFLAGS      = /I. /I../lib /I../include /nologo /W4 /GX /DWIN32 /YX /FD /c /DBUILDING_LIBCURL\r
+CFLAGS      = /I. /I../lib /I../include /nologo /W4 /GX /YX /FD /c /DBUILDING_LIBCURL\r
 !ELSE\r
 CC_NODEBUG  = $(CC) /O2 /DNDEBUG\r
 CC_DEBUG    = $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd\r
-CFLAGS      = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c /DBUILDING_LIBCURL\r
+CFLAGS      = /I. /I ../lib /I../include /nologo /W4 /EHsc /FD /c /DBUILDING_LIBCURL\r
 !ENDIF\r
 \r
 LFLAGS     = /nologo /machine:$(MACHINE)\r
@@ -90,7 +90,7 @@ PDB_NAME_DLL_DEBUG     = $(BASE_NAME_DEBUG).pdb
 \r
 # CURL Command section\r
 PROGRAM_NAME  = curl.exe\r
-CURL_CFLAGS   = /I../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c\r
+CURL_CFLAGS   = /I../lib /I../include /nologo /W4 /EHsc /FD /c\r
 CURL_LFLAGS   = /out:$(DIRDIST)\bin\$(PROGRAM_NAME) /subsystem:console $(LFLAGS)\r
 CURL_RESFLAGS = /i../include\r
 \r