Stylistic change only (added "do { ... } while( 0 )" around multi-statement macros)

[freeglut] / src / freeglut_internal.h

diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h
index effb2e0..4004590 100644 (file)
--- a/src/freeglut_internal.h
+++ b/src/freeglut_internal.h
@@ -28,7 +28,7 @@
 #ifndef  FREEGLUT_INTERNAL_H
 #define  FREEGLUT_INTERNAL_H
 
-#ifdef HAVE_CONFIG_H
+#if HAVE_CONFIG_H
 #    include "config.h"
 #endif
 
@@ -73,18 +73,20 @@
 #include <string.h>
 #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
 
@@ -379,7 +381,7 @@ do                                                             \
 {                                                              \
     if( FETCH_WCB( window, cbname ) != func )                  \
         (((window).CallBacks[CB_ ## cbname]) = (void *) func); \
-} while( 0 )                                                   \
+} while( 0 )
 
 /*
  * FETCH_WCB() is used as: