gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 02:38:52 -05:00
Code Issues Projects Releases Wiki Activity

Removed return value of _glfwPlatformTerminate.

Browse Source
This commit is contained in:
Camilla Berglund 2012-12-30 01:15:48 +01:00
parent 0dd5d20c77
commit 9af61d06cf
5 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cocoa_init.m
View File

@ -120,7 +120,7 @@ int _glfwPlatformInit(void)
// Close window, if open, and shut down GLFW // Close window, if open, and shut down GLFW
//======================================================================== //========================================================================
int _glfwPlatformTerminate(void) void _glfwPlatformTerminate(void)
{ {
// TODO: Probably other cleanup // TODO: Probably other cleanup
@ -146,8 +146,6 @@ int _glfwPlatformTerminate(void)
_glfwTerminateJoysticks(); _glfwTerminateJoysticks();
_glfwTerminateOpenGL(); _glfwTerminateOpenGL();
return GL_TRUE;
} }

3
src/init.c
View File

@ -149,8 +149,7 @@ GLFWAPI void glfwTerminate(void)
while (_glfwLibrary.windowListHead) while (_glfwLibrary.windowListHead)
glfwDestroyWindow(_glfwLibrary.windowListHead); glfwDestroyWindow(_glfwLibrary.windowListHead);
if (!_glfwPlatformTerminate()) _glfwPlatformTerminate();
return;
if (_glfwLibrary.modes) if (_glfwLibrary.modes)
free(_glfwLibrary.modes); free(_glfwLibrary.modes);

2
src/internal.h
View File

@ -260,7 +260,7 @@ extern _GLFWlibrary _glfwLibrary;
// Platform init and version // Platform init and version
int _glfwPlatformInit(void); int _glfwPlatformInit(void);
int _glfwPlatformTerminate(void); void _glfwPlatformTerminate(void);
const char* _glfwPlatformGetVersionString(void); const char* _glfwPlatformGetVersionString(void);
// Input mode support // Input mode support

4
src/win32_init.c
View File

@ -200,7 +200,7 @@ int _glfwPlatformInit(void)
// Close window and shut down library // Close window and shut down library
//======================================================================== //========================================================================
int _glfwPlatformTerminate(void) void _glfwPlatformTerminate(void)
{ {
// Restore the original gamma ramp // Restore the original gamma ramp
if (_glfwLibrary.rampChanged) if (_glfwLibrary.rampChanged)
@ -220,8 +220,6 @@ int _glfwPlatformTerminate(void)
SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0,
UIntToPtr(_glfwLibrary.Win32.foregroundLockTimeout), UIntToPtr(_glfwLibrary.Win32.foregroundLockTimeout),
SPIF_SENDCHANGE); SPIF_SENDCHANGE);
return GL_TRUE;
} }

4
src/x11_init.c
View File

@ -662,7 +662,7 @@ int _glfwPlatformInit(void)
// Close window and shut down library // Close window and shut down library
//======================================================================== //========================================================================
int _glfwPlatformTerminate(void) void _glfwPlatformTerminate(void)
{ {
if (_glfwLibrary.X11.cursor) if (_glfwLibrary.X11.cursor)
{ {
@ -681,8 +681,6 @@ int _glfwPlatformTerminate(void)
// Free clipboard memory // Free clipboard memory
if (_glfwLibrary.X11.selection.string) if (_glfwLibrary.X11.selection.string)
free(_glfwLibrary.X11.selection.string); free(_glfwLibrary.X11.selection.string);
return GL_TRUE;
} }