moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-21 23:58:49 -05:00
Code Issues Releases Wiki Activity

build: remove WIN32_LEAN_AND_MEAN from individual build systems

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

Closes https://github.com/curl/curl/pull/1677
This commit is contained in:
Marcel Raad 2017-07-11 16:51:48 +02:00
parent 274983b774
commit ef5cac3d8c
No known key found for this signature in database
GPG Key ID: 33C416EFAE4D6F02
2 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
acinclude.m4
View File

@ -199,8 +199,6 @@ AC_DEFUN([CURL_CHECK_HEADER_WINDOWS], [
yes) yes)
AC_DEFINE_UNQUOTED(HAVE_WINDOWS_H, 1, AC_DEFINE_UNQUOTED(HAVE_WINDOWS_H, 1,
[Define to 1 if you have the windows.h header file.]) [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 esac
]) ])

3
lib/curl_config.h.cmake
View File

@ -972,9 +972,6 @@
/* Version number of package */ /* Version number of package */
#cmakedefine VERSION ${VERSION} #cmakedefine VERSION ${VERSION}
/* Define to avoid automatic inclusion of winsock.h */
#cmakedefine WIN32_LEAN_AND_MEAN 1
/* Define to 1 if OS is AIX. */ /* Define to 1 if OS is AIX. */
#ifndef _ALL_SOURCE #ifndef _ALL_SOURCE
# undef _ALL_SOURCE # undef _ALL_SOURCE