瀏覽代碼

Fix conflict with DEBUG macro defined by Bazel

The Bazel build system may define DEBUG when compiling on macOS, which
caused the glfwinfo test program to fail to build.

Fixes #1537.

(cherry picked from commit 6abad2efd29adfe41b5ef2e73b1650e45b1725e1)
Camilla Löwy 6 年之前
父節點
當前提交
adcd306fbd
共有 1 個文件被更改,包括 4 次插入3 次删除
  1. 4 3
      tests/glfwinfo.c

+ 4 - 3
tests/glfwinfo.c

@@ -359,7 +359,8 @@ int main(int argc, char** argv)
     GLenum error;
     GLenum error;
     GLFWwindow* window;
     GLFWwindow* window;
 
 
-    enum { CLIENT, CONTEXT, BEHAVIOR, DEBUG, FORWARD, HELP, EXTENSIONS, LAYERS,
+    enum { CLIENT, CONTEXT, BEHAVIOR, DEBUG_CONTEXT, FORWARD, HELP,
+           EXTENSIONS, LAYERS,
            MAJOR, MINOR, PROFILE, ROBUSTNESS, VERSION,
            MAJOR, MINOR, PROFILE, ROBUSTNESS, VERSION,
            REDBITS, GREENBITS, BLUEBITS, ALPHABITS, DEPTHBITS, STENCILBITS,
            REDBITS, GREENBITS, BLUEBITS, ALPHABITS, DEPTHBITS, STENCILBITS,
            ACCUMREDBITS, ACCUMGREENBITS, ACCUMBLUEBITS, ACCUMALPHABITS,
            ACCUMREDBITS, ACCUMGREENBITS, ACCUMBLUEBITS, ACCUMALPHABITS,
@@ -370,7 +371,7 @@ int main(int argc, char** argv)
         { "behavior",           1, NULL, BEHAVIOR },
         { "behavior",           1, NULL, BEHAVIOR },
         { "client-api",         1, NULL, CLIENT },
         { "client-api",         1, NULL, CLIENT },
         { "context-api",        1, NULL, CONTEXT },
         { "context-api",        1, NULL, CONTEXT },
-        { "debug",              0, NULL, DEBUG },
+        { "debug",              0, NULL, DEBUG_CONTEXT },
         { "forward",            0, NULL, FORWARD },
         { "forward",            0, NULL, FORWARD },
         { "help",               0, NULL, HELP },
         { "help",               0, NULL, HELP },
         { "list-extensions",    0, NULL, EXTENSIONS },
         { "list-extensions",    0, NULL, EXTENSIONS },
@@ -461,7 +462,7 @@ int main(int argc, char** argv)
                 }
                 }
                 break;
                 break;
             case 'd':
             case 'd':
-            case DEBUG:
+            case DEBUG_CONTEXT:
                 glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, GLFW_TRUE);
                 glfwWindowHint(GLFW_OPENGL_DEBUG_CONTEXT, GLFW_TRUE);
                 break;
                 break;
             case 'f':
             case 'f':