aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Raad <Marcel.Raad@teamviewer.com>2017-07-11 16:51:48 +0200
committerMarcel Raad <Marcel.Raad@teamviewer.com>2017-07-11 18:16:23 +0200
commitef5cac3d8c6bd2bfd52b75e3f2e8db385565acbd (patch)
tree074f792599c07ddacfb70b26496434afa4aa3b7c
parent274983b774bdd81f050ed8635b4be41fa45b2aaa (diff)
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
-rw-r--r--acinclude.m42
-rw-r--r--lib/curl_config.h.cmake3
2 files changed, 0 insertions, 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