X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_internal.h;h=dbae6769378c3b99acf2c70b0a91982ed7595545;hb=e45a69b97f088c2b10ee2faba04e863692afc9f8;hp=da0b44df15dc5472f058f5d8efa59ca79fc6d744;hpb=39c957d9929f0aba775c4a07a70b6124bc4b50e6;p=freeglut diff --git a/src/fg_internal.h b/src/fg_internal.h index da0b44d..dbae676 100644 --- a/src/fg_internal.h +++ b/src/fg_internal.h @@ -42,7 +42,7 @@ || ( defined(__CYGWIN__) && defined(X_DISPLAY_MISSING) ) # define TARGET_HOST_MS_WINDOWS 1 -#elif defined (ANDROID) +#elif defined (__ANDROID__) # define TARGET_HOST_ANDROID 1 #elif defined(__posix__) || defined(__unix__) || defined(__linux__) || defined(__sun) @@ -166,7 +166,13 @@ typedef unsigned long fg_time_t; #endif - +#ifndef __fg_unused +# ifdef __GNUC__ +# define __fg_unused __attribute__((unused)) +# else +# define __fg_unused +# endif +#endif /* Platform-specific includes */ #if TARGET_HOST_POSIX_X11 @@ -213,6 +219,10 @@ typedef void (* FGCBMultiButton )( int, int, int, int, int ); typedef void (* FGCBMultiMotion )( int, int, int ); typedef void (* FGCBMultiPassive )( int, int, int ); +typedef void (* FGCBFixMyNameInitContext)(); +typedef void (* FGCBFixMyNamePause)(); +typedef void (* FGCBFixMyNameResume)(); + /* The global callbacks type definitions */ typedef void (* FGCBIdle )( void ); typedef void (* FGCBTimer )( int ); @@ -391,6 +401,8 @@ struct tagSFG_WindowState GLboolean NeedToResize; /* Do we need to resize the window? */ GLboolean IsFullscreen; /* is the window fullscreen? */ + + GLboolean NeedToFixMyNameInitContext; /* are OpenGL context/resources loaded? */ }; @@ -522,6 +534,11 @@ enum CB_MultiMotion, CB_MultiPassive, + /* Mobile platforms LifeCycle */ + CB_FixMyNameInitContext, + CB_FixMyNamePause, + CB_FixMyNameResume, + /* Presently ignored */ CB_Select, CB_OverlayDisplay,