Don't use -Wno-misleading-indentation directly

source/native-plugins/external/Makefile.mk

@@ -121,7 +121,6 @@ endif
 # DSP flags
 ZYN_DSP_FLAGS  = $(ZYN_BASE_FLAGS)
 ZYN_DSP_FLAGS += $(shell pkg-config --cflags fftw3 zlib)
-ZYN_DSP_FLAGS += -Wno-misleading-indentation -Wno-shift-negative-value
 ZYN_DSP_LIBS   = $(ZYN_BASE_LIBS)
 ZYN_DSP_LIBS  += $(shell pkg-config --libs fftw3 zlib)
 

source/native-plugins/zynaddsubfx-src.cpp

@@ -22,13 +22,14 @@
 #undef override
 
 // ignore some compiler warnings
-#if defined(__GNUC__) && (__GNUC__ >= 6)
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wshift-negative-value"
-#elif defined(__clang__)
+#if defined(__clang__)
 # pragma clang diagnostic push
 # pragma clang diagnostic ignored "-Winconsistent-missing-override"
 # pragma clang diagnostic ignored "-Wunused-private-field"
+#elif defined(__GNUC__) && (__GNUC__ >= 6)
+# pragma GCC diagnostic push
+# pragma GCC diagnostic ignored "-Wshift-negative-value"
+# pragma GCC diagnostic ignored "-Wmisleading-indentation"
 #endif
 
 // base c-style headers
@@ -540,10 +541,10 @@ extern "C" {
 
 #include "zynaddsubfx/globals.cpp"
 
-#if defined(__GNUC__) && (__GNUC__ >= 6)
-# pragma GCC diagnostic pop
-#elif defined(__clang__)
+#if defined(__clang__)
 # pragma clang diagnostic pop
+#elif defined(__GNUC__) && (__GNUC__ >= 6)
+# pragma GCC diagnostic pop
 #endif
 
 // Dummy variables and functions for linking purposes