From 474daf255eabd124b1023c199c3c7b98f242325c Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Tue, 24 Jan 2012 03:48:12 +0000 Subject: [PATCH] Removing a bunch of "static" declarations from the "fgPlatform" function definitions to remove a raft of Linux errors git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1007 7f0cb862-5218-0410-a997-914c9d46530a --- src/Common/freeglut_cursor.c | 4 ++-- src/Common/freeglut_ext.c | 2 +- src/Common/freeglut_gamemode.c | 6 +++--- src/Common/freeglut_init.c | 6 +++--- src/Common/freeglut_input_devices.c | 2 +- src/Common/freeglut_main.c | 8 ++++---- src/Common/freeglut_menu.c | 2 +- src/Common/freeglut_state.c | 4 ++-- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/Common/freeglut_cursor.c b/src/Common/freeglut_cursor.c index 31af784..ca87127 100644 --- a/src/Common/freeglut_cursor.c +++ b/src/Common/freeglut_cursor.c @@ -104,7 +104,7 @@ static cursorCacheEntry cursorCache[] = { { XC_bottom_left_corner, None } /* GLUT_CURSOR_BOTTOM_LEFT_CORNER */ }; -static void fgPlatformSetCursor ( SFG_Window *window, int cursorID ) +void fgPlatformSetCursor ( SFG_Window *window, int cursorID ) { Cursor cursor; /* @@ -150,7 +150,7 @@ static void fgPlatformSetCursor ( SFG_Window *window, int cursorID ) } -static void fgPlatformWarpPointer ( int x, int y ) +void fgPlatformWarpPointer ( int x, int y ) { XWarpPointer( fgDisplay.Display, diff --git a/src/Common/freeglut_ext.c b/src/Common/freeglut_ext.c index 598edb6..49ff88b 100644 --- a/src/Common/freeglut_ext.c +++ b/src/Common/freeglut_ext.c @@ -223,7 +223,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName ) } -static GLUTproc fgPlatformGlutGetProcAddress( const char* procName ) +GLUTproc fgPlatformGlutGetProcAddress( const char* procName ) { return NULL; } diff --git a/src/Common/freeglut_gamemode.c b/src/Common/freeglut_gamemode.c index d2bbe9a..98aa0b6 100644 --- a/src/Common/freeglut_gamemode.c +++ b/src/Common/freeglut_gamemode.c @@ -163,7 +163,7 @@ static int xrandr_resize(int xsz, int ysz, int rate, int just_checking) * Remembers the current visual settings, so that * we can change them and restore later... */ -static void fgPlatformRememberState( void ) +void fgPlatformRememberState( void ) { int event_base, error_base; @@ -248,7 +248,7 @@ static void fgPlatformRememberState( void ) /* * Restores the previously remembered visual settings */ -static void fgPlatformRestoreState( void ) +void fgPlatformRestoreState( void ) { /* Restore the remembered pointer position: */ XWarpPointer( @@ -398,7 +398,7 @@ static int fghCheckDisplayModes( GLboolean exactMatch, int displayModesCount, XF /* * Changes the current display mode to match user's settings */ -static GLboolean fgPlatformChangeDisplayMode( GLboolean haveToTest ) +GLboolean fgPlatformChangeDisplayMode( GLboolean haveToTest ) { GLboolean success = GL_FALSE; /* first try to use XRandR, then fallback to XF86VidMode */ diff --git a/src/Common/freeglut_init.c b/src/Common/freeglut_init.c index 7f98f47..eab4ac6 100644 --- a/src/Common/freeglut_init.c +++ b/src/Common/freeglut_init.c @@ -246,7 +246,7 @@ int fgHintPresent(Window window, Atom property, Atom hint) /* * A call to this function should initialize all the display stuff... */ -static void fgPlatformInitialize( const char* displayName ) +void fgPlatformInitialize( const char* displayName ) { fgDisplay.Display = XOpenDisplay( displayName ); @@ -437,7 +437,7 @@ void fghCloseInputDevices ( void ) #if TARGET_HOST_POSIX_X11 -static void fgPlatformDeinitialiseInputDevices ( void ) +void fgPlatformDeinitialiseInputDevices ( void ) { fghCloseInputDevices (); @@ -446,7 +446,7 @@ static void fgPlatformDeinitialiseInputDevices ( void ) } -static void fgPlatformCloseDisplay ( void ) +void fgPlatformCloseDisplay ( void ) { /* * Make sure all X-client data we have created will be destroyed on diff --git a/src/Common/freeglut_input_devices.c b/src/Common/freeglut_input_devices.c index a1780d4..bfb6c8c 100644 --- a/src/Common/freeglut_input_devices.c +++ b/src/Common/freeglut_input_devices.c @@ -128,7 +128,7 @@ int fgInputDeviceDetect( void ) * Try initializing the input device(s) */ #if TARGET_HOST_POSIX_X11 -static void fgPlatformRegisterDialDevice ( const char *dial_device ) +void fgPlatformRegisterDialDevice ( const char *dial_device ) { } #endif diff --git a/src/Common/freeglut_main.c b/src/Common/freeglut_main.c index b1654a5..f53f8fa 100644 --- a/src/Common/freeglut_main.c +++ b/src/Common/freeglut_main.c @@ -96,7 +96,7 @@ extern void fgPlatformMainLoopPreliminaryWork ( void ); * match the new window size. */ #if TARGET_HOST_POSIX_X11 -static void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height ) +void fgPlatformReshapeWindow ( SFG_Window *window, int width, int height ) { XResizeWindow( fgDisplay.Display, window->Window.Handle, width, height ); @@ -170,7 +170,7 @@ void fghRedrawWindow ( SFG_Window *window ) * A static helper function to execute display callback for a window */ #if TARGET_HOST_POSIX_X11 -static void fgPlatformDisplayWindow ( SFG_Window *window ) +void fgPlatformDisplayWindow ( SFG_Window *window ) { fghRedrawWindow ( window ) ; } @@ -416,7 +416,7 @@ static long fghNextTimer( void ) */ #if TARGET_HOST_POSIX_X11 -static void fgPlatformSleepForEvents( long msec ) +void fgPlatformSleepForEvents( long msec ) { /* * Possibly due to aggressive use of XFlush() and friends, @@ -1405,7 +1405,7 @@ void fgPlatformProcessSingleEvent ( void ) } -static void fgPlatformMainLoopPreliminaryWork ( void ) +void fgPlatformMainLoopPreliminaryWork ( void ) { } #endif diff --git a/src/Common/freeglut_menu.c b/src/Common/freeglut_menu.c index 7ad06ba..45c07c4 100644 --- a/src/Common/freeglut_menu.c +++ b/src/Common/freeglut_menu.c @@ -143,7 +143,7 @@ static void fghDeactivateSubMenu( SFG_MenuEntry *menuEntry ) * Private function to get the virtual maximum screen extent */ #if TARGET_HOST_POSIX_X11 -static GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y ) +GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y ) { int wx, wy; Window w; diff --git a/src/Common/freeglut_state.c b/src/Common/freeglut_state.c index f3e6e8e..434b41f 100644 --- a/src/Common/freeglut_state.c +++ b/src/Common/freeglut_state.c @@ -73,7 +73,7 @@ static int fghGetConfig( int attribute ) return returnValue; } -static int fgPlatformGlutGet ( GLenum eWhat ) +int fgPlatformGlutGet ( GLenum eWhat ) { int nsamples = 0; @@ -233,7 +233,7 @@ static int fgPlatformGlutGet ( GLenum eWhat ) } -static int fgPlatformGlutDeviceGet ( GLenum eWhat ) +int fgPlatformGlutDeviceGet ( GLenum eWhat ) { switch( eWhat ) { -- 1.7.10.4