[ros-diffs] [tfaber] 73211: [PSEH3] - Avoid trying to disable 'declaration after statement' warnings in C++ CORE-11794

[tfaber]

Author: tfaber
Date: Sat Nov 12 14:52:58 2016
New Revision: 73211

URL: http://svn.reactos.org/svn/reactos?rev=73211&view=rev
Log:
[PSEH3]
- Avoid trying to disable 'declaration after statement' warnings in C++
CORE-11794

Modified:
    trunk/reactos/sdk/include/reactos/libs/pseh/pseh3.h

Modified: trunk/reactos/sdk/include/reactos/libs/pseh/pseh3.h
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/libs/pseh/pseh3.h?rev=73211&r1=73210&r2=73211&view=diff
==============================================================================
--- trunk/reactos/sdk/include/reactos/libs/pseh/pseh3.h [iso-8859-1] (original)
+++ trunk/reactos/sdk/include/reactos/libs/pseh/pseh3.h [iso-8859-1] Sat Nov 12 
14:52:58 2016
@@ -14,6 +14,12 @@
 
 #ifdef __cplusplus
 extern "C" {
+#endif
+
+#ifdef __cplusplus
+#define PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT
+#else
+#define PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT _Pragma("GCC 
diagnostic ignored \"-Wdeclaration-after-statement\"")
 #endif
 
 /* CLANG must safe non-volatiles, because it uses a return-twice algorithm */
@@ -354,7 +360,7 @@
         (void)&&_SEH3$_l_FilterOrFinally; \
 \
 _Pragma("GCC diagnostic push") \
-_Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") \
+PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \
 \
         /* Count the try level. Outside of any __try, _SEH3$_TryLevel is 0 */ \
         enum { \
@@ -386,7 +392,7 @@
         _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \
 \
 _Pragma("GCC diagnostic push") \
-_Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") \
+PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \
 \
         /* Forward declaration of the filter function */ \
         _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FilterFunction); \
@@ -436,7 +442,7 @@
         _SEH3$_ASM_GOTO(_SEH3$_l_OnException); \
 \
 _Pragma("GCC diagnostic push") \
-_Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") \
+PRAGMA_DIAGNOSTIC_IGNORED_DECLARATION_AFTER_STATEMENT \
 \
         /* Forward declaration of the finally function */ \
         _SEH3$_DECLARE_FILTER_FUNC(_SEH3$_FinallyFunction); \