libobs, libobs-opengl: Consistent near/far undef

2021-09-17 21:12:52 -07:00 · 2021-09-17 21:12:52 -07:00 · 3c45ae2e9d
parent 4681e10fdf
commit 3c45ae2e9d
2 changed files with 8 additions and 2 deletions
--- a/libobs-opengl/gl-subsystem.c
+++ b/libobs-opengl/gl-subsystem.c
@ -20,8 +20,12 @@
 #include "gl-subsystem.h"

 /* Goofy Windows.h macros need to be removed */
-#undef far
+#ifdef near
 #undef near
+#endif
+#ifdef far
+#undef far
+#endif

 /* #define SHOW_ALL_GL_MESSAGES */

--- a/libobs/graphics/graphics.c
+++ b/libobs/graphics/graphics.c
@ -28,8 +28,10 @@
 #include "effect-parser.h"
 #include "effect.h"

-#ifdef _MSC_VER
+#ifdef near
 #undef near
+#endif
+#ifdef far
 #undef far
 #endif