Flip ordering of gcc/clang pragma checks

Author: ensiform

code/api/et/q_shared.h

@@ -130,7 +130,14 @@ If you have questions concerning this license or the applicable additional terms
 #endif
 
 #if defined(__GNUC__) || defined(__clang__)
+#ifdef __MINGW32__
+// For some reason MinGW wants both gnu_printf and ms_printf
+#define FORMAT_PRINTF(x, y) \
+	__attribute__((format(gnu_printf, x, y))) \
+	__attribute__((format(ms_printf, x, y)))
+#else
 #define FORMAT_PRINTF(x, y) __attribute__((format (printf, x, y)))
+#endif
 #else
 #define FORMAT_PRINTF(x, y) /* nothing */
 #endif

code/api/shared/q_endian.c

@@ -45,14 +45,14 @@ If you have questions concerning this license or the applicable additional terms
 ============================================================================
 */
 
-#if defined (__GNUC)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wunused-function"
-#endif
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-function"
 #endif
+#if defined (__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wunused-function"
+#endif
 
 void CopyShortSwap(void *dest, void *src)
 {
@@ -82,9 +82,9 @@ float FloatSwap(float f)
 	return out.f;
 }
 
-#if defined (__GNUC)
-#pragma GCC diagnostic pop
-#endif
 #if defined(__clang__)
 #pragma clang diagnostic pop
 #endif
+#if defined (__GNUC__)
+#pragma GCC diagnostic pop
+#endif