From: <sp...@us...> - 2009-07-23 19:07:36
|
Revision: 831 http://freeglut.svn.sourceforge.net/freeglut/?rev=831&view=rev Author: spanne Date: 2009-07-23 19:07:34 +0000 (Thu, 23 Jul 2009) Log Message: ----------- Unbreak the build for non-Windows platforms, fixing obviously untested recent commits. Modified Paths: -------------- trunk/freeglut/freeglut/src/freeglut_init.c trunk/freeglut/freeglut/src/freeglut_internal.h trunk/freeglut/freeglut/src/freeglut_menu.c trunk/freeglut/freeglut/src/freeglut_window.c Modified: trunk/freeglut/freeglut/src/freeglut_init.c =================================================================== --- trunk/freeglut/freeglut/src/freeglut_init.c 2009-07-12 14:29:16 UTC (rev 830) +++ trunk/freeglut/freeglut/src/freeglut_init.c 2009-07-23 19:07:34 UTC (rev 831) @@ -854,7 +854,7 @@ } } -#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) ) Modified: trunk/freeglut/freeglut/src/freeglut_internal.h =================================================================== --- trunk/freeglut/freeglut/src/freeglut_internal.h 2009-07-12 14:29:16 UTC (rev 830) +++ trunk/freeglut/freeglut/src/freeglut_internal.h 2009-07-23 19:07:34 UTC (rev 831) @@ -933,7 +933,7 @@ SFG_Proc fghGetProcAddress( const char *procName ); -#ifdef TARGET_HOST_MS_WINDOWS +#if TARGET_HOST_MS_WINDOWS extern void (__cdecl *__glutExitFunc)( int return_value ); #endif Modified: trunk/freeglut/freeglut/src/freeglut_menu.c =================================================================== --- trunk/freeglut/freeglut/src/freeglut_menu.c 2009-07-12 14:29:16 UTC (rev 830) +++ trunk/freeglut/freeglut/src/freeglut_menu.c 2009-07-23 19:07:34 UTC (rev 831) @@ -779,7 +779,7 @@ 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; Modified: trunk/freeglut/freeglut/src/freeglut_window.c =================================================================== --- trunk/freeglut/freeglut/src/freeglut_window.c 2009-07-12 14:29:16 UTC (rev 830) +++ trunk/freeglut/freeglut/src/freeglut_window.c 2009-07-23 19:07:34 UTC (rev 831) @@ -1093,7 +1093,7 @@ 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; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |