openglut_exp.h   openglut_exp.h 
skipping to change at line 55 skipping to change at line 55
/* /*
* GLUT API Extension macro definitions -- display mode * GLUT API Extension macro definitions -- display mode
*/ */
#define GLUT_BORDERLESS 0x0800 #define GLUT_BORDERLESS 0x0800
/* /*
* OpenGLUT experimental functions. * OpenGLUT experimental functions.
*/ */
OGAPI int glutCreateMenuWindow( int parent, int x, int y, int w, int h ); OGAPI int glutCreateMenuWindow( int parent, int x, int y, int w, int h );
OGAPI void glutSetWindowStayOnTop( int enable );
/*
* Allow for conditional compilation of experimental features.
*/
#define OPENGLUT_MENUWINDOW
#define OPENGLUT_STAYONTOP
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added


 openglut_std.h   openglut_std.h 
skipping to change at line 108 skipping to change at line 108
* Let the application programmer use the OpenGLUT version to determine * Let the application programmer use the OpenGLUT version to determine
* features, not our pseudo-freeglut version compatibility. * features, not our pseudo-freeglut version compatibility.
* *
* If this is an issue, we can re-enable it later. * If this is an issue, we can re-enable it later.
* *
*/ */
#define GLUT_API_VERSION 4 #define GLUT_API_VERSION 4
/* #define FREEGLUT 1 */ /* #define FREEGLUT 1 */
/* #define FREEGLUT_VERSION_2_0 1 */ /* #define FREEGLUT_VERSION_2_0 1 */
#define OPENGLUT #define OPENGLUT
#define OPENGLUT_VERSION_0_6_2 #define OPENGLUT_VERSION_0_6_3
/* /*
* Always include OpenGL and GLU headers * Always include OpenGL and GLU headers
*/ */
#include <GL/gl.h> #include <GL/gl.h>
#include <GL/glu.h> #include <GL/glu.h>
/* /*
* GLUT API macro definitions -- the special key codes: * GLUT API macro definitions -- the special key codes:
*/ */
skipping to change at line 351 skipping to change at line 351
*/ */
#define GLUT_GAME_MODE_ACTIVE 0x0000 #define GLUT_GAME_MODE_ACTIVE 0x0000
#define GLUT_GAME_MODE_POSSIBLE 0x0001 #define GLUT_GAME_MODE_POSSIBLE 0x0001
#define GLUT_GAME_MODE_WIDTH 0x0002 #define GLUT_GAME_MODE_WIDTH 0x0002
#define GLUT_GAME_MODE_HEIGHT 0x0003 #define GLUT_GAME_MODE_HEIGHT 0x0003
#define GLUT_GAME_MODE_PIXEL_DEPTH 0x0004 #define GLUT_GAME_MODE_PIXEL_DEPTH 0x0004
#define GLUT_GAME_MODE_REFRESH_RATE 0x0005 #define GLUT_GAME_MODE_REFRESH_RATE 0x0005
#define GLUT_GAME_MODE_DISPLAY_CHANGED 0x0006 #define GLUT_GAME_MODE_DISPLAY_CHANGED 0x0006
/* /*
* Initialization functions, see fglut_init.c * Initialization functions, see og_init.c
*/ */
OGAPI void OGAPIENTRY glutInit( int* pargc, char** argv ); OGAPI void OGAPIENTRY glutInit( int* pargc, char** argv );
OGAPI void OGAPIENTRY glutInitWindowPosition( int x, int y ); OGAPI void OGAPIENTRY glutInitWindowPosition( int x, int y );
OGAPI void OGAPIENTRY glutInitWindowSize( int width, int height ); OGAPI void OGAPIENTRY glutInitWindowSize( int width, int height );
OGAPI void OGAPIENTRY glutInitDisplayMode( unsigned int displayMode ); OGAPI void OGAPIENTRY glutInitDisplayMode( unsigned int displayMode );
OGAPI void OGAPIENTRY glutInitDisplayString( const char* displayMode ); OGAPI void OGAPIENTRY glutInitDisplayString( const char* displayMode );
/* /*
* Process loop function, see og_main.c * Process loop function, see og_main.c
*/ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/