Fixed <sys/time.h> / <time.h> handling as suggested by the autoconf

docs.

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@548 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/configure.ac b/configure.ac
index 3d00d8b..9d5bc07 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,8 @@ AC_SUBST([LIBXXF86VM])
 
 # Checks for header files.
 AC_HEADER_STDC
-AC_CHECK_HEADERS([GL/gl.h GL/glu.h GL/glx.h])
+AC_CHECK_HEADERS([sys/time.h GL/gl.h GL/glu.h GL/glx.h])
+AC_HEADER_TIME
 
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS $X_CFLAGS"

diff --git a/progs/demos/Lorenz/lorenz.c b/progs/demos/Lorenz/lorenz.c
index be32c77..f2de979 100644 (file)
--- a/progs/demos/Lorenz/lorenz.c
+++ b/progs/demos/Lorenz/lorenz.c
@@ -31,7 +31,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <time.h>
 #include <GL/freeglut.h>
 #ifdef WIN32
 /* DUMP MEMORY LEAKS */

diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
index b9cc632..effb2e0 100644 (file)
--- a/src/freeglut_internal.h
+++ b/src/freeglut_internal.h
@@ -76,7 +76,16 @@
 #include <stdarg.h>
 #if TARGET_HOST_UNIX_X11
 #include <unistd.h>
-#include <sys/time.h>
+#    if TIME_WITH_SYS_TIME
+#        include <sys/time.h>
+#        include <time.h>
+#    else
+#        if HAVE_SYS_TIME_H
+#            include <sys/time.h>
+#        else
+#            include <time.h>
+#        endif
+#    endif
 #endif
 
 /* The system-dependant include files should go here: */

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index 134ffb3..a62ffc0 100644 (file)
--- a/src/freeglut_main.c
+++ b/src/freeglut_main.c
@@ -31,7 +31,6 @@
 #include <limits.h>
 #if TARGET_HOST_UNIX_X11
 #include <sys/types.h>
-#include <sys/time.h>
 #include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>