Consolidate the USE_WINDOWS_API to a single place.

wolfSSL · Oct 22, 2024 · b5cc863 · b5cc863
1 parent 76aae03
commit b5cc863
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/wolfssl/wolfcrypt/types.h b/wolfssl/wolfcrypt/types.h
@@ -429,16 +429,6 @@ typedef struct w64wrapper {
         #define FALL_THROUGH
     #endif
 
-    /* For platforms where the target OS is not Windows, but compilation is
-     * done on Windows/Visual Studio, enable a way to disable USE_WINDOWS_API.
-     * Examples: Micrium, TenAsus INtime, uTasker, FreeRTOS simulator */
-    #if defined(_WIN32) && !defined(MICRIUM) && !defined(FREERTOS) && \
-        !defined(FREERTOS_TCP) && !defined(EBSNET) && \
-        !defined(WOLFSSL_UTASKER) && !defined(INTIME_RTOS) && \
-        !defined(WOLFSSL_NOT_WINDOWS_API)
-        #define USE_WINDOWS_API
-    #endif
-
     #define XSTR_SIZEOF(x) (sizeof(x) - 1) /* -1 to not count the null char */
 
     #define XELEM_CNT(x) (sizeof((x))/sizeof(*(x)))

diff --git a/wolfssl/wolfcrypt/wc_port.h b/wolfssl/wolfcrypt/wc_port.h
@@ -33,6 +33,16 @@
     extern "C" {
 #endif
 
+/* For platforms where the target OS is not Windows, but compilation is
+ * done on Windows/Visual Studio, enable a way to disable USE_WINDOWS_API.
+ * Examples: Micrium, TenAsus INtime, uTasker, FreeRTOS simulator */
+#if defined(_WIN32) && !defined(MICRIUM) && !defined(FREERTOS) && \
+    !defined(FREERTOS_TCP) && !defined(EBSNET) && \
+    !defined(WOLFSSL_UTASKER) && !defined(INTIME_RTOS) && \
+    !defined(WOLFSSL_NOT_WINDOWS_API)
+    #define USE_WINDOWS_API
+#endif
+
 /* Detect if compiler supports C99. "NO_WOLF_C99" can be defined in
  * user_settings.h to disable checking for C99 support. */
 #if !defined(WOLF_C99) && defined(__STDC_VERSION__) && \