Moving some function prototypes into the source files where they are found and out...

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

diff --git a/src/Common/freeglut_internal.h b/src/Common/freeglut_internal.h
index cacb55b..cb527ff 100644 (file)
--- a/src/Common/freeglut_internal.h
+++ b/src/Common/freeglut_internal.h
@@ -852,20 +852,6 @@ void fgDeinitialize( void );
 void fgCreateStructure( void );\r
 void fgDestroyStructure( void );\r
 \r
-/* A helper function to check if a display mode is possible to use */\r
-#if TARGET_HOST_POSIX_X11\r
-GLXFBConfig* fgChooseFBConfig( int* numcfgs );\r
-#endif\r
-\r
-/* The window procedure for Win32 events handling */\r
-#if TARGET_HOST_MS_WINDOWS\r
-LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg,\r
-                               WPARAM wParam, LPARAM lParam );\r
-void fgNewWGLCreateContext( SFG_Window* window );\r
-GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,\r
-                              unsigned char layer_type );\r
-#endif\r
-\r
 /*\r
  * Window creation, opening, closing and destruction.\r
  * Also CallBack clearing/initialization.\r

diff --git a/src/Common/freeglut_state.c b/src/Common/freeglut_state.c
index 20221bb..f3e6e8e 100644 (file)
--- a/src/Common/freeglut_state.c
+++ b/src/Common/freeglut_state.c
@@ -45,6 +45,12 @@ extern int fgPlatformGlutGet ( GLenum eWhat );
 extern int fgPlatformGlutDeviceGet ( GLenum eWhat );\r
 extern int fgPlatformGlutLayerGet ( GLenum eWhat );\r
 \r
+/* A helper function to check if a display mode is possible to use */\r
+#if TARGET_HOST_POSIX_X11\r
+GLXFBConfig* fgChooseFBConfig( int* numcfgs );\r
+#endif\r
+\r
+\r
 /* -- LOCAL DEFINITIONS ---------------------------------------------------- */\r
 \r
 /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */\r

diff --git a/src/mswin/freeglut_init_mswin.c b/src/mswin/freeglut_init_mswin.c
index 1777ebd..d75765f 100644 (file)
--- a/src/mswin/freeglut_init_mswin.c
+++ b/src/mswin/freeglut_init_mswin.c
@@ -29,6 +29,11 @@
 #include "freeglut_internal_mswin.h"\r
 \r
 \r
+\r
+extern LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg,\r
+                               WPARAM wParam, LPARAM lParam );\r
+\r
+\r
 /*\r
  * A call to this function should initialize all the display stuff...\r
  */\r

diff --git a/src/mswin/freeglut_main_mswin.c b/src/mswin/freeglut_main_mswin.c
index 7037e3d..96ec77b 100644 (file)
--- a/src/mswin/freeglut_main_mswin.c
+++ b/src/mswin/freeglut_main_mswin.c
@@ -31,6 +31,11 @@
 \r
 extern void fghRedrawWindow ( SFG_Window *window );\r
 \r
+extern void fgNewWGLCreateContext( SFG_Window* window );\r
+extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,\r
+                                     unsigned char layer_type );\r
+\r
+\r
 \r
 void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height )\r
 {\r

diff --git a/src/mswin/freeglut_state_mswin.c b/src/mswin/freeglut_state_mswin.c
index 764259c..e552291 100644 (file)
--- a/src/mswin/freeglut_state_mswin.c
+++ b/src/mswin/freeglut_state_mswin.c
@@ -29,6 +29,9 @@
 #include "freeglut_internal_mswin.h"\r
 \r
 \r
+extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly,\r
+                                     unsigned char layer_type );\r
+\r
 \r
 /* The following include file is available from SGI but is not standard:\r
  *   #include <GL/wglext.h>\r