Moving the platform-specific window handle and context type definitions into platform...

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

diff --git a/src/Common/freeglut_internal.h b/src/Common/freeglut_internal.h
index 7697094..815d13e 100644 (file)
--- a/src/Common/freeglut_internal.h
+++ b/src/Common/freeglut_internal.h
@@ -214,6 +214,7 @@ LONG WINAPI ChangeDisplaySettingsExW(LPCWSTR,LPDEVMODEW,HWND,DWORD,LPVOID);
 \r
 /* Platform-specific includes */\r
 #if TARGET_HOST_POSIX_X11\r
+\r
 typedef struct tagSFG_PlatformDisplay SFG_PlatformDisplay;\r
 struct tagSFG_PlatformDisplay\r
 {\r
@@ -247,6 +248,15 @@ struct tagSFG_PlatformDisplay
     int             DisplayPointerY;    /* saved Y location of the pointer   */\r
 };\r
 \r
+\r
+/*\r
+ * Make "freeglut" window handle and context types so that we don't need so\r
+ * much conditionally-compiled code later in the library.\r
+ */\r
+typedef Window     SFG_WindowHandleType ;\r
+typedef GLXContext SFG_WindowContextType ;\r
+\r
+\r
 #endif\r
 #if TARGET_HOST_MS_WINDOWS\r
 #include "../mswin/freeglut_internal_mswin.h"\r
@@ -419,22 +429,6 @@ struct tagSFG_Timer
 };\r
 \r
 /*\r
- * Make "freeglut" window handle and context types so that we don't need so\r
- * much conditionally-compiled code later in the library.\r
- */\r
-#if TARGET_HOST_POSIX_X11\r
-\r
-typedef Window     SFG_WindowHandleType ;\r
-typedef GLXContext SFG_WindowContextType ;\r
-\r
-#elif TARGET_HOST_MS_WINDOWS\r
-\r
-typedef HWND    SFG_WindowHandleType ;\r
-typedef HGLRC   SFG_WindowContextType ;\r
-\r
-#endif\r
-\r
-/*\r
  * A window and its OpenGL context. The contents of this structure\r
  * are highly dependant on the target operating system we aim at...\r
  */\r

diff --git a/src/mswin/freeglut_internal_mswin.h b/src/mswin/freeglut_internal_mswin.h
index baf4800..bd392f0 100644 (file)
--- a/src/mswin/freeglut_internal_mswin.h
+++ b/src/mswin/freeglut_internal_mswin.h
@@ -36,6 +36,13 @@ struct tagSFG_PlatformDisplay
     char           *DisplayName;        /* Display name for multi display support*/ \r
 };\r
 \r
+/*\r
+ * Make "freeglut" window handle and context types so that we don't need so\r
+ * much conditionally-compiled code later in the library.\r
+ */\r
+typedef HWND    SFG_WindowHandleType ;\r
+typedef HGLRC   SFG_WindowContextType ;\r
+\r
 \r
 \r
 #endif  /* FREEGLUT_INTERNAL_MSWIN_H */
\ No newline at end of file