Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 18:15:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Win32 macro conflict

Browse Source
This commit is contained in:
Camilla Berglund 2015-10-28 02:14:42 +01:00
parent 23bf1b530b
commit 048966bb44
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/glfwinfo.c
View File

@ -227,7 +227,7 @@ int main(int argc, char** argv)
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,
AUXBUFFERS, SAMPLES, STEREO, SRGB, SINGLEBUFFER, NOERROR }; AUXBUFFERS, SAMPLES, STEREO, SRGB, SINGLEBUFFER, NOERROR_SRSLY };
const struct option options[] = const struct option options[] =
{ {
{ "behavior", 1, NULL, BEHAVIOR }, { "behavior", 1, NULL, BEHAVIOR },
@ -256,7 +256,7 @@ int main(int argc, char** argv)
{ "stereo", 0, NULL, STEREO }, { "stereo", 0, NULL, STEREO },
{ "srgb", 0, NULL, SRGB }, { "srgb", 0, NULL, SRGB },
{ "singlebuffer", 0, NULL, SINGLEBUFFER }, { "singlebuffer", 0, NULL, SINGLEBUFFER },
{ "no-error", 0, NULL, NOERROR }, { "no-error", 0, NULL, NOERROR_SRSLY },
{ NULL, 0, NULL, 0 } { NULL, 0, NULL, 0 }
}; };
@ -449,7 +449,7 @@ int main(int argc, char** argv)
case SINGLEBUFFER: case SINGLEBUFFER:
glfwWindowHint(GLFW_DOUBLEBUFFER, GLFW_FALSE); glfwWindowHint(GLFW_DOUBLEBUFFER, GLFW_FALSE);
break; break;
case NOERROR: case NOERROR_SRSLY:
glfwWindowHint(GLFW_CONTEXT_NO_ERROR, GLFW_TRUE); glfwWindowHint(GLFW_CONTEXT_NO_ERROR, GLFW_TRUE);
break; break;
default: default: