From: Marcel Raad <Marcel.Raad@teamviewer.com>
Date: Tue, 11 Jul 2017 14:51:48 +0000 (+0200)
Subject: build: remove WIN32_LEAN_AND_MEAN from individual build systems
X-Git-Tag: curl-7_55_0~67
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ef5cac3d8c6bd2bfd52b75e3f2e8db385565acbd;p=thirdparty%2Fcurl.git

build: remove WIN32_LEAN_AND_MEAN from individual build systems

It's defined for all build systems in curl_setup.h since commit
beb08481d01a07a8b10938b1078a5e298b1c2912. This caused macro
redefinition warnings in the configure builds.

Closes https://github.com/curl/curl/pull/1677
---

diff --git a/acinclude.m4 b/acinclude.m4
index fe0e020b08..8a6c414a79 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -199,8 +199,6 @@ AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [
     yes)
       AC_DEFINE_UNQUOTED(HAVE_WINDOWS_H, 1,
         [Define to 1 if you have the windows.h header file.])
-      AC_DEFINE_UNQUOTED(WIN32_LEAN_AND_MEAN, 1,
-        [Define to avoid automatic inclusion of winsock.h])
       ;;
   esac
 ])
diff --git a/lib/curl_config.h.cmake b/lib/curl_config.h.cmake
index 812d96977a..c1452b3e72 100644
--- a/lib/curl_config.h.cmake
+++ b/lib/curl_config.h.cmake
@@ -972,9 +972,6 @@
 /* Version number of package */
 #cmakedefine VERSION ${VERSION}
 
-/* Define to avoid automatic inclusion of winsock.h */
-#cmakedefine WIN32_LEAN_AND_MEAN 1
-
 /* Define to 1 if OS is AIX. */
 #ifndef _ALL_SOURCE
 #  undef _ALL_SOURCE