[GNUnet-SVN] [gnurl] 140/208: build: remove WIN32_LEAN_AND_MEAN from individual build systems

[gnunet]

This is an automated email from the git hooks/post-receive script.

ng0 pushed a commit to annotated tag gnurl-7.55.0
in repository gnurl.

commit ef5cac3d8c6bd2bfd52b75e3f2e8db385565acbd
Author: Marcel Raad <address@hidden>
AuthorDate: Tue Jul 11 16:51:48 2017 +0200

    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
---
 acinclude.m4            | 2 --
 lib/curl_config.h.cmake | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index fe0e020b0..8a6c414a7 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 812d96977..c1452b3e7 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

-- 
To stop receiving notification emails like this one, please contact
address@hidden