X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=include%2FGL%2Ffreeglut_ext.h;h=db9c7dbfe58504eb796b1413504e02ee3d9c40dc;hb=9acd72b9fba35a42b91308c77384489191d471dc;hp=da6c7ee234759bf9deb0b44440a3a396cd56e458;hpb=ea5dc8a10beb55cd972c34d6b531158101b6773f;p=freeglut

diff --git a/include/GL/freeglut_ext.h b/include/GL/freeglut_ext.h
index da6c7ee..db9c7db 100644
--- a/include/GL/freeglut_ext.h
+++ b/include/GL/freeglut_ext.h
@@ -86,7 +86,7 @@
 
 #define  GLUT_SKIP_STALE_MOTION_EVENTS      0x0204
 
-#define  GLUT_OBJECTS_VISUALIZE_NORMALS     0x0205
+#define  GLUT_GEOMETRY_VISUALIZE_NORMALS    0x0205
 
 /*
  * New tokens for glutInitDisplayMode.
@@ -139,9 +139,10 @@ FGAPI void    FGAPIENTRY glutLeaveFullScreen( void );
  * Window-specific callback functions, see freeglut_callbacks.c
  */
 FGAPI void    FGAPIENTRY glutMouseWheelFunc( void (* callback)( int, int, int, int ) );
+FGAPI void    FGAPIENTRY glutPositionFunc( void (* callback)( int, int ) );
 FGAPI void    FGAPIENTRY glutCloseFunc( void (* callback)( void ) );
 FGAPI void    FGAPIENTRY glutWMCloseFunc( void (* callback)( void ) );
-/* A. Donev: Also a destruction callback for menus */
+/* And also a destruction callback for menus */
 FGAPI void    FGAPIENTRY glutMenuDestroyFunc( void (* callback)( void ) );
 
 /*
@@ -218,15 +219,13 @@ void    glutJoystickGetCenter( int ident, float *axes );
 /*
  * Initialization functions, see freeglut_init.c
  */
+/* to get the typedef for va_list */
+#include <stdarg.h>
 FGAPI void    FGAPIENTRY glutInitContextVersion( int majorVersion, int minorVersion );
 FGAPI void    FGAPIENTRY glutInitContextFlags( int flags );
 FGAPI void    FGAPIENTRY glutInitContextProfile( int profile );
-
-/* to get the typedef for va_list */
-#include <stdarg.h>
-
-FGAPI void    FGAPIENTRY glutInitErrorFunc( void (* vError)( const char *fmt, va_list ap ) );
-FGAPI void    FGAPIENTRY glutInitWarningFunc( void (* vWarning)( const char *fmt, va_list ap ) );
+FGAPI void    FGAPIENTRY glutInitErrorFunc( void (* callback)( const char *fmt, va_list ap ) );
+FGAPI void    FGAPIENTRY glutInitWarningFunc( void (* callback)( const char *fmt, va_list ap ) );
 
 /* OpenGL >= 2.0 support */
 FGAPI void    FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib);