Fixing a bug I introduced into the "...ATEXIT" hack

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1031 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
fayjf 2012-01-30 03:34:22 +00:00
parent 89d7b12018
commit 412df6db71
3 changed files with 3 additions and 3 deletions

View File

@ -25,6 +25,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#define FREEGLUT_BUILDING_LIB
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "../Common/freeglut_internal.h" #include "../Common/freeglut_internal.h"
@ -331,7 +332,6 @@ int XParseGeometry (
/* -- PLATFORM-SPECIFIC INTERFACE FUNCTION -------------------------------------------------- */ /* -- PLATFORM-SPECIFIC INTERFACE FUNCTION -------------------------------------------------- */
void (__cdecl *__glutExitFunc)( int return_value ) = NULL; void (__cdecl *__glutExitFunc)( int return_value ) = NULL;
void FGAPIENTRY __glutInitWithExit( int *pargc, char **argv, void (__cdecl *exit_function)(int) ) void FGAPIENTRY __glutInitWithExit( int *pargc, char **argv, void (__cdecl *exit_function)(int) )

View File

@ -25,6 +25,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#define FREEGLUT_BUILDING_LIB
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "../Common/freeglut_internal.h" #include "../Common/freeglut_internal.h"
@ -39,7 +40,6 @@ GLvoid fgPlatformGetGameModeVMaxExtent( SFG_Window* window, int* x, int* y )
/* -- PLATFORM-SPECIFIC INTERFACE FUNCTION -------------------------------------------------- */ /* -- PLATFORM-SPECIFIC INTERFACE FUNCTION -------------------------------------------------- */
int FGAPIENTRY __glutCreateMenuWithExit( void(* callback)( int ), void (__cdecl *exit_function)(int) ) int FGAPIENTRY __glutCreateMenuWithExit( void(* callback)( int ), void (__cdecl *exit_function)(int) )
{ {
__glutExitFunc = exit_function; __glutExitFunc = exit_function;

View File

@ -25,6 +25,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
#define FREEGLUT_BUILDING_LIB
#include <GL/freeglut.h> #include <GL/freeglut.h>
#include "../Common/freeglut_internal.h" #include "../Common/freeglut_internal.h"
@ -1080,7 +1081,6 @@ void fgPlatformGlutFullScreenToggle( SFG_Window *win )
/* -- PLATFORM-SPECIFIC INTERFACE FUNCTION -------------------------------------------------- */ /* -- PLATFORM-SPECIFIC INTERFACE FUNCTION -------------------------------------------------- */
int FGAPIENTRY __glutCreateWindowWithExit( const char *title, void (__cdecl *exit_function)(int) ) int FGAPIENTRY __glutCreateWindowWithExit( const char *title, void (__cdecl *exit_function)(int) )
{ {
__glutExitFunc = exit_function; __glutExitFunc = exit_function;