projects
/
freeglut
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing X11 "unterminated #if" build error
[freeglut]
/
src
/
Common
/
freeglut_init.c
diff --git
a/src/Common/freeglut_init.c
b/src/Common/freeglut_init.c
index
1af391e
..
d8e87e0
100644
(file)
--- a/
src/Common/freeglut_init.c
+++ b/
src/Common/freeglut_init.c
@@
-99,6
+99,7
@@
SFG_State fgState = { { -1, -1, GL_FALSE }, /* Position */
extern void fgPlatformInitialize( const char* displayName );
\r
extern void fgPlatformDeinitialiseInputDevices ( void );
\r
extern void fgPlatformCloseDisplay ( void );
\r
extern void fgPlatformInitialize( const char* displayName );
\r
extern void fgPlatformDeinitialiseInputDevices ( void );
\r
extern void fgPlatformCloseDisplay ( void );
\r
+extern void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext );
\r
\r
\r
void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
\r
\r
\r
void fghParseCommandLineArguments ( int* pargc, char** argv, char **pDisplayName, char **pGeometry )
\r
@@
-234,10
+235,7
@@
void fgDeinitialize( void )
/* If there was a menu created, destroy the rendering context */
\r
if( fgStructure.MenuContext )
\r
{
\r
/* If there was a menu created, destroy the rendering context */
\r
if( fgStructure.MenuContext )
\r
{
\r
-#if TARGET_HOST_POSIX_X11
\r
- /* Note that the MVisualInfo is not owned by the MenuContext! */
\r
- glXDestroyContext( fgDisplay.pDisplay.Display, fgStructure.MenuContext->MContext );
\r
-#endif
\r
+ fgPlatformDestroyContext (fgDisplay.pDisplay, fgStructure.MenuContext->MContext );
\r
free( fgStructure.MenuContext );
\r
fgStructure.MenuContext = NULL;
\r
}
\r
free( fgStructure.MenuContext );
\r
fgStructure.MenuContext = NULL;
\r
}
\r