X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Ffg_internal.h;h=1c7429e0579168d3015a6d6a9e22ccd5b5a0cd93;hb=8c3eab0efb7f82a94014e0c1342c287e19461041;hp=c7dd53b11c34f52dbcf23fb006078737052822e4;hpb=a9bd975460c45c5781ba25ca9360bbe48bdfde88;p=freeglut diff --git a/src/fg_internal.h b/src/fg_internal.h index c7dd53b..1c7429e 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 @@ -319,8 +325,8 @@ struct tagSFG_State int MajorVersion; /* Major OpenGL context version */ int MinorVersion; /* Minor OpenGL context version */ int ContextFlags; /* OpenGL context flags */ - int HasOpenGL20; /* fgInitGL2 could find all OpenGL 2.0 functions */ int ContextProfile; /* OpenGL context profile */ + int HasOpenGL20; /* fgInitGL2 could find all OpenGL 2.0 functions */ FGError ErrorFunc; /* User defined error handler */ FGWarning WarningFunc; /* User defined warning handler */ }; @@ -361,6 +367,8 @@ struct tagSFG_Context SFG_PlatformContext pContext; /* The window's FBConfig (X11) or device context (Windows) */ int DoubleBuffered; /* Treat the window as double-buffered */ + GLint attribute_v_coord; + GLint attribute_v_normal; };