FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removing some duplicate code from "freeglut_init.c" and its Windows version

Browse Source 
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@988 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-01-20 04:20:28 +00:00
parent 93b2137e8f
commit c449ab244c
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
freeglut/freeglut/src/Common/freeglut_init.c
View File

@ -322,8 +322,7 @@ static void fghInitialize( const char* displayName )
#endif #endif
#if TARGET_HOST_POSIX_X11 void fghCloseInputDevices ( void )
static void fghDeinitialiseInputDevices ( void )
{ {
if ( fgState.JoysticksInitialised ) if ( fgState.JoysticksInitialised )
fgJoystickClose( ); fgJoystickClose( );
@ -336,6 +335,16 @@ static void fghDeinitialiseInputDevices ( void )
} }
#if TARGET_HOST_POSIX_X11
static void fghDeinitialiseInputDevices ( void )
{
fghCloseInputDevices ();
fgState.JoysticksInitialised = GL_FALSE;
fgState.InputDevsInitialised = GL_FALSE;
}
static void fghCloseDisplay ( void ) static void fghCloseDisplay ( void )
{ {
/* /*

8
freeglut/freeglut/src/mswin/freeglut_init_mswin.c
View File

@ -129,14 +129,12 @@ void fghInitialize( const char* displayName )
/* Platform-Specific Deinitialization Functions: */ /* Platform-Specific Deinitialization Functions: */
extern void fghCloseInputDevices ( void );
void fghDeinitialiseInputDevices ( void ) void fghDeinitialiseInputDevices ( void )
{ {
#if !defined(_WIN32_WCE) #if !defined(_WIN32_WCE)
if ( fgState.JoysticksInitialised ) fghCloseInputDevices ();
fgJoystickClose( );
if ( fgState.InputDevsInitialised )
fgInputDeviceClose( );
#endif /* !defined(_WIN32_WCE) */ #endif /* !defined(_WIN32_WCE) */
fgState.JoysticksInitialised = GL_FALSE; fgState.JoysticksInitialised = GL_FALSE;
fgState.InputDevsInitialised = GL_FALSE; fgState.InputDevsInitialised = GL_FALSE;