From 048966bb447a872cb10e71fca08d48eeb0b69224 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Wed, 28 Oct 2015 02:14:42 +0100 Subject: [PATCH] Fix Win32 macro conflict --- tests/glfwinfo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/glfwinfo.c b/tests/glfwinfo.c index c77a84de..0a113745 100644 --- a/tests/glfwinfo.c +++ b/tests/glfwinfo.c @@ -227,7 +227,7 @@ int main(int argc, char** argv) MAJOR, MINOR, PROFILE, ROBUSTNESS, VERSION, REDBITS, GREENBITS, BLUEBITS, ALPHABITS, DEPTHBITS, STENCILBITS, ACCUMREDBITS, ACCUMGREENBITS, ACCUMBLUEBITS, ACCUMALPHABITS, - AUXBUFFERS, SAMPLES, STEREO, SRGB, SINGLEBUFFER, NOERROR }; + AUXBUFFERS, SAMPLES, STEREO, SRGB, SINGLEBUFFER, NOERROR_SRSLY }; const struct option options[] = { { "behavior", 1, NULL, BEHAVIOR }, @@ -256,7 +256,7 @@ int main(int argc, char** argv) { "stereo", 0, NULL, STEREO }, { "srgb", 0, NULL, SRGB }, { "singlebuffer", 0, NULL, SINGLEBUFFER }, - { "no-error", 0, NULL, NOERROR }, + { "no-error", 0, NULL, NOERROR_SRSLY }, { NULL, 0, NULL, 0 } }; @@ -449,7 +449,7 @@ int main(int argc, char** argv) case SINGLEBUFFER: glfwWindowHint(GLFW_DOUBLEBUFFER, GLFW_FALSE); break; - case NOERROR: + case NOERROR_SRSLY: glfwWindowHint(GLFW_CONTEXT_NO_ERROR, GLFW_TRUE); break; default: