From 9af61d06cfb8fba7e51e72eb07fde93b92df4adf Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Sun, 30 Dec 2012 01:15:48 +0100 Subject: [PATCH] Removed return value of _glfwPlatformTerminate. --- src/cocoa_init.m | 4 +--- src/init.c | 3 +-- src/internal.h | 2 +- src/win32_init.c | 4 +--- src/x11_init.c | 4 +--- 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/cocoa_init.m b/src/cocoa_init.m index e4de641e..99638710 100644 --- a/src/cocoa_init.m +++ b/src/cocoa_init.m @@ -120,7 +120,7 @@ int _glfwPlatformInit(void) // Close window, if open, and shut down GLFW //======================================================================== -int _glfwPlatformTerminate(void) +void _glfwPlatformTerminate(void) { // TODO: Probably other cleanup @@ -146,8 +146,6 @@ int _glfwPlatformTerminate(void) _glfwTerminateJoysticks(); _glfwTerminateOpenGL(); - - return GL_TRUE; } diff --git a/src/init.c b/src/init.c index 4d7b731e..521674ab 100644 --- a/src/init.c +++ b/src/init.c @@ -149,8 +149,7 @@ GLFWAPI void glfwTerminate(void) while (_glfwLibrary.windowListHead) glfwDestroyWindow(_glfwLibrary.windowListHead); - if (!_glfwPlatformTerminate()) - return; + _glfwPlatformTerminate(); if (_glfwLibrary.modes) free(_glfwLibrary.modes); diff --git a/src/internal.h b/src/internal.h index d2619e2e..c8530bd5 100644 --- a/src/internal.h +++ b/src/internal.h @@ -260,7 +260,7 @@ extern _GLFWlibrary _glfwLibrary; // Platform init and version int _glfwPlatformInit(void); -int _glfwPlatformTerminate(void); +void _glfwPlatformTerminate(void); const char* _glfwPlatformGetVersionString(void); // Input mode support diff --git a/src/win32_init.c b/src/win32_init.c index 62d6c94b..490b2aca 100644 --- a/src/win32_init.c +++ b/src/win32_init.c @@ -200,7 +200,7 @@ int _glfwPlatformInit(void) // Close window and shut down library //======================================================================== -int _glfwPlatformTerminate(void) +void _glfwPlatformTerminate(void) { // Restore the original gamma ramp if (_glfwLibrary.rampChanged) @@ -220,8 +220,6 @@ int _glfwPlatformTerminate(void) SystemParametersInfo(SPI_SETFOREGROUNDLOCKTIMEOUT, 0, UIntToPtr(_glfwLibrary.Win32.foregroundLockTimeout), SPIF_SENDCHANGE); - - return GL_TRUE; } diff --git a/src/x11_init.c b/src/x11_init.c index b5631fba..e260c6cc 100644 --- a/src/x11_init.c +++ b/src/x11_init.c @@ -662,7 +662,7 @@ int _glfwPlatformInit(void) // Close window and shut down library //======================================================================== -int _glfwPlatformTerminate(void) +void _glfwPlatformTerminate(void) { if (_glfwLibrary.X11.cursor) { @@ -681,8 +681,6 @@ int _glfwPlatformTerminate(void) // Free clipboard memory if (_glfwLibrary.X11.selection.string) free(_glfwLibrary.X11.selection.string); - - return GL_TRUE; }