Merge pull request #22254 from longnguyen2004:mingw-strsafe

2 years ago · 6fe7886e2b
parent 139c443770 199c2d2fd0
commit 6fe7886e2b
1 changed files with 4 additions and 1 deletions
--- a/modules/videoio/src/cap_dshow.cpp
+++ b/modules/videoio/src/cap_dshow.cpp
@ -90,8 +90,11 @@ Thanks to:

 #if defined(__clang__)  // clang or MSVC clang
 #pragma clang diagnostic ignored "-Wnon-virtual-dtor"
-#elif defined(__GNUC__) // MinGW
+#elif defined(__GNUC__) // gcc
 #pragma GCC diagnostic ignored "-Wnon-virtual-dtor"
+#endif
+
+#ifdef __MINGW32__
 #define STRSAFE_NO_DEPRECATE
 #endif