diff options
| -rw-r--r-- | progs/demos/geartrain.c | 6 | ||||
| -rw-r--r-- | progs/demos/isosurf.c | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/progs/demos/geartrain.c b/progs/demos/geartrain.c index c612ad74bf0..98addb8eb4b 100644 --- a/progs/demos/geartrain.c +++ b/progs/demos/geartrain.c @@ -1,4 +1,4 @@ -/* $Id: geartrain.c,v 1.7 2000/11/30 01:44:24 gareth Exp $ */ +/* $Id: geartrain.c,v 1.8 2001/10/04 19:14:26 kschultz Exp $ */ /* * GearTrain Simulator * Version: 1.00 @@ -32,7 +32,9 @@ #include <string.h> #include <stdio.h> +#ifndef min #define min(x, y) ( x < y ? x : y ) +#endif #ifndef M_PI #define M_PI 3.14159265 @@ -103,6 +105,7 @@ static GLint T0 = 0; static GLint Frames = 0; +#ifndef _WIN32 static void strset (char buf[], char ch) { @@ -110,6 +113,7 @@ strset (char buf[], char ch) for (i = 0; i < strlen (buf); i++) buf[i] = ch; } +#endif static void diff --git a/progs/demos/isosurf.c b/progs/demos/isosurf.c index 2706ad9faef..437cdf40437 100644 --- a/progs/demos/isosurf.c +++ b/progs/demos/isosurf.c @@ -1,4 +1,4 @@ -/* $Id: isosurf.c,v 1.12 2001/06/04 15:34:31 keithw Exp $ */ +/* $Id: isosurf.c,v 1.13 2001/10/04 19:14:26 kschultz Exp $ */ /* * Display an isosurface of 3-D wind speed volume. @@ -30,6 +30,9 @@ #include <stdlib.h> #include <string.h> #include <math.h> +#ifdef _WIN32 +#include <windows.h> +#endif #define GL_GLEXT_LEGACY #include "GL/glut.h" |