]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
projects / thirdparty / curl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 940e1c1)
curl_setup: define NOGDI on Windows
authorMarcel Raad <Marcel.Raad@teamviewer.com>
Mon, 8 Oct 2018 09:33:15 +0000 (11:33 +0200)
committerMarcel Raad <Marcel.Raad@teamviewer.com>
Tue, 9 Oct 2018 06:33:53 +0000 (08:33 +0200)
This avoids an ERROR macro clash between <wingdi.h> and <arpa/tftp.h>
on MinGW.

Closes https://github.com/curl/curl/pull/3113

lib/curl_setup.h patch | blob | blame | history

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 6513d30f1d80d5f56a04d589d79a3b6725aeabdb..b84501556ffdf9a2202a3e75f8420a0e6a100646 100644 (file)
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -44,6 +44,9 @@
 #  ifndef WIN32_LEAN_AND_MEAN
 #    define WIN32_LEAN_AND_MEAN
 #  endif
+#  ifndef NOGDI
+#    define NOGDI
+#  endif
 #endif
 
 /*
Mirror of https://github.com/curl/curl.git