Improved <sys/typed.h> / <unistd.h> handling as suggested by the

autoconf docs.

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

diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
index effb2e0..17509ad 100644 (file)
--- a/src/freeglut_internal.h
+++ b/src/freeglut_internal.h
@@ -74,17 +74,20 @@
 #include <math.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#if TARGET_HOST_UNIX_X11
-#include <unistd.h>
-#    if TIME_WITH_SYS_TIME
+#if HAVE_SYS_TYPES_H
+#    include <sys/types.h>
+#endif
+#if HAVE_UNISTD_H
+#    include <unistd.h>
+#endif
+#if TIME_WITH_SYS_TIME
+#    include <sys/time.h>
+#    include <time.h>
+#else
+#    if HAVE_SYS_TIME_H
 #        include <sys/time.h>
-#        include <time.h>
 #    else
-#        if HAVE_SYS_TIME_H
-#            include <sys/time.h>
-#        else
-#            include <time.h>
-#        endif
+#        include <time.h>
 #    endif
 #endif
 

diff --git a/src/freeglut_joystick.c b/src/freeglut_joystick.c
index ec599f3..fb77bb4 100644 (file)
--- a/src/freeglut_joystick.c
+++ b/src/freeglut_joystick.c
@@ -89,7 +89,6 @@
 #        define JS_RETURN (sizeof(struct JS_DATA_TYPE))
 #    endif
 
-#    include <unistd.h>
 #    include <fcntl.h>
 #    include <errno.h>
 

diff --git a/src/freeglut_main.c b/src/freeglut_main.c
index a62ffc0..7c214dd 100644 (file)
--- a/src/freeglut_main.c
+++ b/src/freeglut_main.c
@@ -30,8 +30,6 @@
 
 #include <limits.h>
 #if TARGET_HOST_UNIX_X11
-#include <sys/types.h>
-#include <unistd.h>
 #include <errno.h>
 #include <sys/stat.h>
 #elif TARGET_HOST_WIN32