From fc6f0b39d73b3d9f6ee900f23015fac4f692c644 Mon Sep 17 00:00:00 2001 From: Sven Panne Date: Thu, 23 Jul 2009 19:07:34 +0000 Subject: [PATCH] Unbreak the build for non-Windows platforms, fixing obviously untested recent commits. git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@831 7f0cb862-5218-0410-a997-914c9d46530a --- src/freeglut_init.c | 2 +- src/freeglut_internal.h | 2 +- src/freeglut_menu.c | 2 +- src/freeglut_window.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/freeglut_init.c b/src/freeglut_init.c index b419025..c9bd04d 100644 --- a/src/freeglut_init.c +++ b/src/freeglut_init.c @@ -854,7 +854,7 @@ void FGAPIENTRY glutInit( int* pargc, char** argv ) } } -#ifdef TARGET_HOST_MS_WINDOWS +#if TARGET_HOST_MS_WINDOWS void (__cdecl *__glutExitFunc)( int return_value ) = NULL; void FGAPIENTRY __glutInitWithExit( int *pargc, char **argv, void (__cdecl *exit_function)(int) ) diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h index 121df1a..cb294aa 100644 --- a/src/freeglut_internal.h +++ b/src/freeglut_internal.h @@ -933,7 +933,7 @@ int fgHintPresent(Window window, Atom property, Atom hint); SFG_Proc fghGetProcAddress( const char *procName ); -#ifdef TARGET_HOST_MS_WINDOWS +#if TARGET_HOST_MS_WINDOWS extern void (__cdecl *__glutExitFunc)( int return_value ); #endif diff --git a/src/freeglut_menu.c b/src/freeglut_menu.c index dccc4dc..ea5837e 100644 --- a/src/freeglut_menu.c +++ b/src/freeglut_menu.c @@ -779,7 +779,7 @@ int FGAPIENTRY glutCreateMenu( void(* callback)( int ) ) return fgCreateMenu( callback )->ID; } -#ifdef TARGET_HOST_MS_WINDOWS +#if TARGET_HOST_MS_WINDOWS int FGAPIENTRY __glutCreateMenuWithExit( void(* callback)( int ), void (__cdecl *exit_function)(int) ) { __glutExitFunc = exit_function; diff --git a/src/freeglut_window.c b/src/freeglut_window.c index 6366d0e..04e4b0b 100644 --- a/src/freeglut_window.c +++ b/src/freeglut_window.c @@ -1093,7 +1093,7 @@ int FGAPIENTRY glutCreateWindow( const char* title ) GL_FALSE, GL_FALSE )->ID; } -#ifdef TARGET_HOST_MS_WINDOWS +#if TARGET_HOST_MS_WINDOWS int FGAPIENTRY __glutCreateWindowWithExit( const char *title, void (__cdecl *exit_function)(int) ) { __glutExitFunc = exit_function; -- 1.7.10.4