From: John F. Fay <johnffay@nettally.com>
Date: Sun, 29 Jan 2012 13:11:30 +0000 (+0000)
Subject: Moving the Windows-specific includes into the Windows-specific header file
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=commitdiff_plain;h=0533f65a199109084a2cfc04ccb1e1fbae700729;p=freeglut

Moving the Windows-specific includes into the Windows-specific header file

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

diff --git a/src/Common/freeglut_internal.h b/src/Common/freeglut_internal.h
index 7199da7..d6d1743 100644
--- a/src/Common/freeglut_internal.h
+++ b/src/Common/freeglut_internal.h
@@ -88,23 +88,7 @@
 
 /* -- PLATFORM-SPECIFIC INCLUDES ------------------------------------------- */
 
-/* All Win32 headers depend on the huge windows.h recursive include.
- * Note: Lower-case header names are used, for best cross-platform
- * compatibility.
- */
-#if TARGET_HOST_MS_WINDOWS && !defined(_WIN32_WCE)
-#    include <windows.h>
-#    include <windowsx.h>
-#    include <mmsystem.h>
-/* CYGWIN does not have tchar.h, but has TEXT(x), defined in winnt.h. */
-#    ifndef __CYGWIN__
-#      include <tchar.h>
-#    else
-#      define _TEXT(x) TEXT(x)
-#      define _T(x)    TEXT(x)
-#    endif
-
-#elif TARGET_HOST_POSIX_X11
+#if TARGET_HOST_POSIX_X11
 #    include <GL/glx.h>
 #    include <X11/Xlib.h>
 #    include <X11/Xatom.h>
diff --git a/src/mswin/freeglut_internal_mswin.h b/src/mswin/freeglut_internal_mswin.h
index 4f8aaba..a18efb2 100644
--- a/src/mswin/freeglut_internal_mswin.h
+++ b/src/mswin/freeglut_internal_mswin.h
@@ -28,6 +28,27 @@
 #ifndef  FREEGLUT_INTERNAL_MSWIN_H
 #define  FREEGLUT_INTERNAL_MSWIN_H
 
+
+/* All Win32 headers depend on the huge windows.h recursive include.
+ * Note: Lower-case header names are used, for best cross-platform
+ * compatibility.
+ */
+#if !defined(_WIN32_WCE)
+#    include <windows.h>
+#    include <windowsx.h>
+#    include <mmsystem.h>
+/* CYGWIN does not have tchar.h, but has TEXT(x), defined in winnt.h. */
+#    ifndef __CYGWIN__
+#      include <tchar.h>
+#    else
+#      define _TEXT(x) TEXT(x)
+#      define _T(x)    TEXT(x)
+#    endif
+
+#endif
+
+
+
 typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;
 struct tagSFG_PlatformDisplay
 {