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

Assisted-by: Jay Satiro
Reviewed-by: Marcel Raad
Follow up to #9312
Closes #9375

diff --git a/CMake/CurlTests.c b/CMake/CurlTests.c
index e55e3a62923a914276b3f3ce0848e7fd2b3356c9..0ea7a541f068b4b4bad9f3840ca9372fc66a5c5d 100644 (file)
--- a/CMake/CurlTests.c
+++ b/CMake/CurlTests.c
@@ -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 */

diff --git a/lib/setup-win32.h b/lib/setup-win32.h
index c16928db908bf40f44b62b7aae0ecb8f9475ab04..e54f9d79800660ca53214a63e55cec1445ce989a 100644 (file)
--- a/lib/setup-win32.h
+++ b/lib/setup-win32.h
@@ -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