From: Viktor Szakats <commit@vsz.me>
Date: Sun, 20 Jul 2025 20:52:31 +0000 (+0200)
Subject: curl_setup.h: move UWP detection after `config-win32.h`
X-Git-Tag: curl-8_16_0~429
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=792a61e2047782b85da0332cf298a747ce11e8e6;p=thirdparty%2Fcurl.git

curl_setup.h: move UWP detection after `config-win32.h`

To honor a `_WIN32_WINNT` set by `config-win32.h`.

Closes #17980
---

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 4dc46f7a73..2f566945e3 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -93,30 +93,6 @@
 #endif
 #endif /* _MSC_VER */
 
-#ifdef _WIN32
-/*
- * Do not 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
-/* Detect Windows App environment which has a restricted access
- * to the Win32 APIs. */
-#  if (defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602)) || \
-     defined(WINAPI_FAMILY)
-#    include <winapifamily.h>
-#    if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) &&  \
-       !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
-#      define CURL_WINDOWS_UWP
-#    endif
-#  endif
-#endif
-
 /* Avoid bogus format check warnings with mingw32ce gcc 4.4.0 in
    C99 (-std=gnu99) mode */
 #if defined(__MINGW32CE__) && !defined(CURL_NO_FMT_CHECKS) && \
@@ -163,6 +139,31 @@
 
 #endif /* HAVE_CONFIG_H */
 
+/* Keep this section after config-win32.h to honor a _WIN32_WINNT set there */
+#ifdef _WIN32
+/*
+ * Do not 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
+/* Detect Windows App environment which has a restricted access
+ * to the Win32 APIs. */
+#  if (defined(_WIN32_WINNT) && (_WIN32_WINNT >= 0x0602)) || \
+     defined(WINAPI_FAMILY)
+#    include <winapifamily.h>
+#    if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) &&  \
+       !WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
+#      define CURL_WINDOWS_UWP
+#    endif
+#  endif
+#endif
+
 /* ================================================================ */
 /* Definition of preprocessor macros/symbols which modify compiler  */
 /* behavior or generated code characteristics must be done here,   */