Changeset 3088 for trunk/src/opengl

Timestamp:

Mar 11, 2000, 6:24:28 PM (25 years ago)

Author:

bird

Message:

Fix to ignore gettimeofday defined in sys\time.h from the Warp Toolkit (CSD2).

File:

• trunk/src/opengl/glut/glutos2.h (modified) (2 diffs)

trunk/src/opengl/glut/glutos2.h

@@ -1 @@
-/* $Id: glutos2.h,v 1.3 2000-03-11 15:07:47 sandervl Exp $ */
+/* $Id: glutos2.h,v 1.4 2000-03-11 17:24:28 bird Exp $ */
 #ifndef __glutos2_h__
 #define __glutos2_h__
@@ -12 +12 @@
 #include "os2_glx.h"
 #include <misc.h>
+/* KSO: Dirty trick to get around problems with gettimeofday being
+ * defined in the sys\time.h in the toolkit. (at least in CSD2)
+ */
+#define gettimeofday gettimeofday_os2
 #include <sys\time.h>
+#undef gettimeofday
 
 /* We have to undef some things because Microsoft likes to pollute the