X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=progs%2Fdemos%2Fshapes%2Fshapes.c;h=da32e0bed4af06573b092681cada83cb6ceace08;hb=43bba79f58ea3c6d188bfd295d4c9f74730d9189;hp=8836ccc14a947d876fa498dc36017c6e1b849dd3;hpb=1e778f9ed7ff8009e4555ef4043509b0c9f01ebd;p=freeglut diff --git a/progs/demos/shapes/shapes.c b/progs/demos/shapes/shapes.c index 8836ccc..da32e0b 100644 --- a/progs/demos/shapes/shapes.c +++ b/progs/demos/shapes/shapes.c @@ -41,7 +41,7 @@ #include #include -#ifdef WIN32 +#ifdef _MSC_VER /* DUMP MEMORY LEAKS */ #include #endif @@ -189,7 +189,11 @@ static void shapesPrintf (int row, int col, const char *fmt, ...) va_list args; va_start(args, fmt); +#if defined(WIN32) && !defined(__CYGWIN__) + (void) _vsnprintf (buf, sizeof(buf), fmt, args); +#else (void) vsnprintf (buf, sizeof(buf), fmt, args); +#endif va_end(args); glGetIntegerv(GL_VIEWPORT,viewport); @@ -360,7 +364,7 @@ main(int argc, char *argv[]) glutInitWindowSize(640,480); glutInitWindowPosition(40,40); glutInit(&argc, argv); - glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); + glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_MULTISAMPLE); glutCreateWindow("OpenGLUT Shapes"); @@ -395,7 +399,7 @@ main(int argc, char *argv[]) glutMainLoop(); -#ifdef WIN32 +#ifdef _MSC_VER /* DUMP MEMORY LEAK INFORMATION */ _CrtDumpMemoryLeaks () ; #endif