X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d4596328440c89a2e8efb9ce472fd6d2212d9db5..14619f10b0bdb630206607abd0ce0319d45e095a:/include/wx/defs.h

diff --git a/include/wx/defs.h b/include/wx/defs.h
index 16159b1f06..26bbf9721c 100644
--- a/include/wx/defs.h
+++ b/include/wx/defs.h
@@ -350,43 +350,37 @@ typedef short int WXTYPE;
     #endif
 #endif
 
-#ifndef HAVE_TYPE_TRAITS
-    #if defined(__has_include) && __has_include(<type_traits>)
-        #define HAVE_TYPE_TRAITS
+#ifndef HAVE_TR1_TYPE_TRAITS
+    #if defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729)
+        #define HAVE_TR1_TYPE_TRAITS
     #endif
 #endif
 
-#ifndef HAVE_TR1_TYPE_TRAITS
-    #if defined(__has_include) && __has_include(<tr1/type_traits>)
-        #define HAVE_TR1_TYPE_TRAITS
-    #elif defined(__VISUALC__) && (_MSC_FULL_VER >= 150030729)
+#if defined(__has_include)
+    #if !defined(HAVE_TYPE_TRAITS) && __has_include(<type_traits>)
+        #define HAVE_TYPE_TRAITS
+    #endif
+
+    #if !defined(HAVE_TR1_TYPE_TRAITS) && __has_include(<tr1/type_traits>)
         #define HAVE_TR1_TYPE_TRAITS
     #endif
-#endif
 
-#ifndef HAVE_STD_UNORDERED_MAP
-    #if defined(__has_include) && __has_include(<unordered_map>)
+    #if !defined(HAVE_STD_UNORDERED_MAP) && __has_include(<unordered_map>)
         #define HAVE_STD_UNORDERED_MAP
     #endif
-#endif
 
-#ifndef HAVE_TR1_UNORDERED_MAP
-    #if defined(__has_include) && __has_include(<tr1/unordered_map>)
+    #if !defined(HAVE_TR1_UNORDERED_MAP) && __has_include(<tr1/unordered_map>)
         #define HAVE_TR1_UNORDERED_MAP
     #endif
-#endif
 
-#ifndef HAVE_STD_UNORDERED_SET
-    #if defined(__has_include) && __has_include(<unordered_set>)
+    #if !defined(HAVE_STD_UNORDERED_SET) && __has_include(<unordered_set>)
         #define HAVE_STD_UNORDERED_SET
     #endif
-#endif
 
-#ifndef HAVE_TR1_UNORDERED_SET
-    #if defined(__has_include) && __has_include(<tr1/unordered_set>)
+    #if !defined(HAVE_TR1_UNORDERED_SET) && __has_include(<tr1/unordered_set>)
         #define HAVE_TR1_UNORDERED_SET
     #endif
-#endif
+#endif // defined(__has_include)
 
 /* provide replacement for C99 va_copy() if the compiler doesn't have it */
 
@@ -431,17 +425,6 @@ typedef short int WXTYPE;
     #endif /* va_copy/!va_copy */
 #endif /* wxVaCopy */
 
-#ifndef HAVE_VARIADIC_MACROS
-    #if wxCHECK_WATCOM_VERSION(1,2)
-        #define HAVE_VARIADIC_MACROS
-    #endif
-
-    #if wxCHECK_VISUALC_VERSION(9)
-        #define HAVE_VARIADIC_MACROS
-    #endif
-#endif /* HAVE_VARIADIC_MACROS */
-
-
 #ifndef HAVE_WOSTREAM
     /*
         Mingw <= 3.4 and all versions of Cygwin don't have std::wostream