Fix more compiler warnings

[freeglut] / src / fg_internal.h

diff --git a/src/fg_internal.h b/src/fg_internal.h
index 34fdc8e..1c7429e 100644 (file)
--- a/src/fg_internal.h
+++ b/src/fg_internal.h
@@ -32,11 +32,6 @@
 #    include "config.h"
 #endif
 
-/* XXX Update these for each release! */
-#define  VERSION_MAJOR 3
-#define  VERSION_MINOR 0
-#define  VERSION_PATCH 0
-
 /* Freeglut is intended to function under all Unix/X11 and Win32 platforms. */
 /* XXX: Don't all MS-Windows compilers (except Cygwin) have _WIN32 defined?
  * XXX: If so, remove the first set of defined()'s below.
@@ -47,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)
@@ -163,13 +158,21 @@
 #elif defined(HAVE_INTTYPES_H)
 #   include <inttypes.h>
     typedef uint64_t fg_time_t;
+#elif defined(HAVE_U__INT64)
+    typedef unsigned __int64 fg_time_t;
 #elif defined(HAVE_ULONG_LONG)
     typedef unsigned long long fg_time_t;
 #else
     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
@@ -317,10 +320,13 @@ struct tagSFG_State
     int              AuxiliaryBufferNumber;  /* Number of auxiliary buffers */
     int              SampleNumber;         /*  Number of samples per pixel  */
 
+    GLboolean        SkipStaleMotion;      /* skip stale motion events */
+
     int              MajorVersion;         /* Major OpenGL context version  */
     int              MinorVersion;         /* Minor OpenGL context version  */
     int              ContextFlags;         /* OpenGL context flags          */
     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;
 };
 
 
@@ -959,7 +967,6 @@ SFG_Proc fgPlatformGetProcAddress( const char *procName );
 #define ATTRIB(a) attributes[where++]=(a)
 #define ATTRIB_VAL(a,v) {ATTRIB(a); ATTRIB(v);}
 
-int fghIsLegacyContextVersionRequested( void );
 int fghMapBit( int mask, int from, int to );
 int fghIsLegacyContextRequested( void );
 void fghContextCreationError( void );