Merge pull request #541 from kazssym/win32-error

Fix macro handling to avoid conflicts with Win32 API headers
coin3d · Jan 19, 2025 · b1a082c · b1a082c
2 parents 905021d + 34a7ebd
commit b1a082c
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/include/Inventor/errors/SoDebugError.h b/include/Inventor/errors/SoDebugError.h
@@ -39,7 +39,8 @@
 // Avoid problem with Microsoft Win32 API headers (yes, they actually
 // #define ERROR -- in wingdi.h).
 #if defined(ERROR)
-#define SODEBUGERROR_STORE_ERROR_DEF ERROR
+#define SODEBUGERROR_STORE_ERROR_DEF
+#pragma push_macro("ERROR")
 #undef ERROR
 #endif /* ERROR */
 
@@ -82,7 +83,7 @@ class COIN_DLL_API SoDebugError : public SoError {
 
 // Avoid problem with Microsoft Win32 API headers (see above).
 #if defined(SODEBUGERROR_STORE_ERROR_DEF)
-#define ERROR SODEBUGERROR_STORE_ERROR_DEF
+#pragma pop_macro("ERROR")
 #undef SODEBUGERROR_STORE_ERROR_DEF
 #endif /* SODEBUGERROR_STORE_ERROR_DEF */