summaryrefslogtreecommitdiff
path: root/src/glut/glx/win32_util.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2000-03-20 19:26:01 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2000-03-20 19:26:01 +0000
commit66ae25078ef01bcfa2e9eb1ccdbbb5f038c71179 (patch)
tree1f150bd3ec81ad3e6492f8ba5dd2a27f9a057e4e /src/glut/glx/win32_util.c
parentf7b5707d66678f09bec652ecce024a0da6cc4a4b (diff)
patched for Cygwin (Sven Panne)
Diffstat (limited to 'src/glut/glx/win32_util.c')
-rw-r--r--src/glut/glx/win32_util.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/glut/glx/win32_util.c b/src/glut/glx/win32_util.c
index 8dc714c035..d05d1d1e82 100644
--- a/src/glut/glx/win32_util.c
+++ b/src/glut/glx/win32_util.c
@@ -11,11 +11,7 @@
#include "glutint.h"
#include "glutstroke.h"
#include "glutbitmap.h"
-#if defined(__CYGWIN32__)
-typedef MINMAXINFO* LPMINMAXINFO;
-#else
#include <sys/timeb.h>
-#endif
/* The following added by Paul Garceau <pgarceau@teleport.com> */
#if defined(__MINGW32__)
@@ -27,6 +23,7 @@ struct timeval;
extern StrokeFontRec glutStrokeRoman, glutStrokeMonoRoman;
extern BitmapFontRec glutBitmap8By13, glutBitmap9By15, glutBitmapTimesRoman10, glutBitmapTimesRoman24, glutBitmapHelvetica10, glutBitmapHelvetica12, glutBitmapHelvetica18;
+#ifndef __CYGWIN32__
int
gettimeofday(struct timeval* tp, void* tzp)
{
@@ -39,6 +36,7 @@ gettimeofday(struct timeval* tp, void* tzp)
/* 0 indicates that the call succeeded. */
return 0;
}
+#endif
/* To get around the fact that Microsoft DLLs only allow functions
to be exported and now data addresses (as Unix DSOs support), the