mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-30 14:22:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

lib: add required Win32 setup definitions in setup-win32.h

Browse Source 
Assisted-by: Jay Satiro
Reviewed-by: Marcel Raad

Follow up to #9312
Closes #9375
This commit is contained in:
Marc Hoersken 2022-08-26 21:16:47 +02:00
parent 5e259d7b23
commit 0c68e2545c
No known key found for this signature in database
GPG Key ID: 61E03CBED7BC859E
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMake/CurlTests.c
View File

@ -539,17 +539,6 @@ main() {
#ifdef HAVE_WIN32_WINNT
/* includes start */
#ifdef WIN32
/*
* Don't include unneeded stuff in Windows headers to avoid compiler
* warnings and macro clashes.
* Make sure to define this macro before including any Windows headers.
*/
# ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# ifndef NOGDI
# define NOGDI
# endif
# include "../lib/setup-win32.h"
#endif
/* includes end */

11
lib/setup-win32.h
View File

@ -42,6 +42,17 @@
# if defined(_UNICODE) && !defined(UNICODE)
# define UNICODE
# endif
/*
* Don't include unneeded stuff in Windows headers to avoid compiler
* warnings and macro clashes.
* Make sure to define this macro before including any Windows headers.
*/
# ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
# endif
# ifndef NOGDI
# define NOGDI
# endif
# include <winerror.h>
# include <windows.h>
# ifdef HAVE_WINSOCK2_H