From b7ffd3e60d961de87355b3027e589eb150337e60 Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Mon, 23 Jan 2012 05:06:58 +0000 Subject: [PATCH] Moving some function prototypes into the source files where they are found and out of the "freeglut_internal.h" file git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1001 7f0cb862-5218-0410-a997-914c9d46530a --- src/Common/freeglut_internal.h | 14 -------------- src/Common/freeglut_state.c | 6 ++++++ src/mswin/freeglut_init_mswin.c | 5 +++++ src/mswin/freeglut_main_mswin.c | 5 +++++ src/mswin/freeglut_state_mswin.c | 3 +++ 5 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/Common/freeglut_internal.h b/src/Common/freeglut_internal.h index cacb55b..cb527ff 100644 --- a/src/Common/freeglut_internal.h +++ b/src/Common/freeglut_internal.h @@ -852,20 +852,6 @@ void fgDeinitialize( void ); void fgCreateStructure( void ); void fgDestroyStructure( void ); -/* A helper function to check if a display mode is possible to use */ -#if TARGET_HOST_POSIX_X11 -GLXFBConfig* fgChooseFBConfig( int* numcfgs ); -#endif - -/* The window procedure for Win32 events handling */ -#if TARGET_HOST_MS_WINDOWS -LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, - WPARAM wParam, LPARAM lParam ); -void fgNewWGLCreateContext( SFG_Window* window ); -GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, - unsigned char layer_type ); -#endif - /* * Window creation, opening, closing and destruction. * Also CallBack clearing/initialization. diff --git a/src/Common/freeglut_state.c b/src/Common/freeglut_state.c index 20221bb..f3e6e8e 100644 --- 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 ); extern int fgPlatformGlutLayerGet ( GLenum eWhat ); +/* A helper function to check if a display mode is possible to use */ +#if TARGET_HOST_POSIX_X11 +GLXFBConfig* fgChooseFBConfig( int* numcfgs ); +#endif + + /* -- LOCAL DEFINITIONS ---------------------------------------------------- */ /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */ diff --git a/src/mswin/freeglut_init_mswin.c b/src/mswin/freeglut_init_mswin.c index 1777ebd..d75765f 100644 --- a/src/mswin/freeglut_init_mswin.c +++ b/src/mswin/freeglut_init_mswin.c @@ -29,6 +29,11 @@ #include "freeglut_internal_mswin.h" + +extern LRESULT CALLBACK fgPlatformWindowProc( HWND hWnd, UINT uMsg, + WPARAM wParam, LPARAM lParam ); + + /* * A call to this function should initialize all the display stuff... */ diff --git a/src/mswin/freeglut_main_mswin.c b/src/mswin/freeglut_main_mswin.c index 7037e3d..96ec77b 100644 --- a/src/mswin/freeglut_main_mswin.c +++ b/src/mswin/freeglut_main_mswin.c @@ -31,6 +31,11 @@ extern void fghRedrawWindow ( SFG_Window *window ); +extern void fgNewWGLCreateContext( SFG_Window* window ); +extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, + unsigned char layer_type ); + + void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height ) { diff --git a/src/mswin/freeglut_state_mswin.c b/src/mswin/freeglut_state_mswin.c index 764259c..e552291 100644 --- a/src/mswin/freeglut_state_mswin.c +++ b/src/mswin/freeglut_state_mswin.c @@ -29,6 +29,9 @@ #include "freeglut_internal_mswin.h" +extern GLboolean fgSetupPixelFormat( SFG_Window* window, GLboolean checkOnly, + unsigned char layer_type ); + /* The following include file is available from SGI but is not standard: * #include -- 1.7.10.4