Removed remnants of CVS.

[freeglut] / progs / demos / shapes / shapes.c

diff --git a/progs/demos/shapes/shapes.c b/progs/demos/shapes/shapes.c
index 8836ccc..da32e0b 100644 (file)
--- a/progs/demos/shapes/shapes.c
+++ b/progs/demos/shapes/shapes.c
@@ -41,7 +41,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#ifdef WIN32
+#ifdef _MSC_VER
 /* DUMP MEMORY LEAKS */
 #include <crtdbg.h>
 #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