From 325b6327a5df4c476789ac5a329031677f3ca59b Mon Sep 17 00:00:00 2001 From: Don Heyse Date: Fri, 7 Feb 2003 21:30:24 +0000 Subject: [PATCH] Moved freeglut_internal.h to the freeglut source code private directory. git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@50 7f0cb862-5218-0410-a997-914c9d46530a --- freeglut-1.3/freeglut_callbacks.c | 2 +- freeglut-1.3/freeglut_cursor.c | 2 +- freeglut-1.3/freeglut_display.c | 2 +- freeglut-1.3/freeglut_font_data.c | 2 +- freeglut-1.3/freeglut_gamemode.c | 2 +- freeglut-1.3/freeglut_geometry.c | 2 +- freeglut-1.3/freeglut_init.c | 12 ++++++------ freeglut-1.3/freeglut_joystick.c | 4 ++-- freeglut-1.3/freeglut_misc.c | 2 +- freeglut-1.3/freeglut_overlay.c | 2 +- freeglut-1.3/freeglut_stroke_mono_roman.c | 2 +- freeglut-1.3/freeglut_stroke_roman.c | 2 +- freeglut-1.3/freeglut_teapot.c | 2 +- freeglut-1.3/freeglut_videoresize.c | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/freeglut-1.3/freeglut_callbacks.c b/freeglut-1.3/freeglut_callbacks.c index 129a4cd..0438f13 100644 --- a/freeglut-1.3/freeglut_callbacks.c +++ b/freeglut-1.3/freeglut_callbacks.c @@ -32,7 +32,7 @@ #define G_LOG_DOMAIN "freeglut-callbacks" #include "../include/GL/freeglut.h" -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" /* -- INTERFACE FUNCTIONS -------------------------------------------------- */ diff --git a/freeglut-1.3/freeglut_cursor.c b/freeglut-1.3/freeglut_cursor.c index 53ce750..ed67eff 100644 --- a/freeglut-1.3/freeglut_cursor.c +++ b/freeglut-1.3/freeglut_cursor.c @@ -32,7 +32,7 @@ #define G_LOG_DOMAIN "freeglut-cursor" #include "../include/GL/freeglut.h" -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" #if TARGET_HOST_UNIX_X11 #include diff --git a/freeglut-1.3/freeglut_display.c b/freeglut-1.3/freeglut_display.c index 0b1f672..91f6b6a 100644 --- a/freeglut-1.3/freeglut_display.c +++ b/freeglut-1.3/freeglut_display.c @@ -36,7 +36,7 @@ #define G_LOG_DOMAIN "freeglut-display" #include "../include/GL/freeglut.h" -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" /* -- INTERFACE FUNCTIONS -------------------------------------------------- */ diff --git a/freeglut-1.3/freeglut_font_data.c b/freeglut-1.3/freeglut_font_data.c index 0a48dae..c18a15e 100644 --- a/freeglut-1.3/freeglut_font_data.c +++ b/freeglut-1.3/freeglut_font_data.c @@ -29,7 +29,7 @@ #endif #include "../include/GL/freeglut.h" -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" /* * Following fonts are defined in this file: diff --git a/freeglut-1.3/freeglut_gamemode.c b/freeglut-1.3/freeglut_gamemode.c index 3964068..30c552c 100644 --- a/freeglut-1.3/freeglut_gamemode.c +++ b/freeglut-1.3/freeglut_gamemode.c @@ -32,7 +32,7 @@ #define G_LOG_DOMAIN "freeglut-gamemode" #include "../include/GL/freeglut.h" -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" /* * TODO BEFORE THE STABLE RELEASE: diff --git a/freeglut-1.3/freeglut_geometry.c b/freeglut-1.3/freeglut_geometry.c index f1b1dda..1c03a36 100644 --- a/freeglut-1.3/freeglut_geometry.c +++ b/freeglut-1.3/freeglut_geometry.c @@ -32,7 +32,7 @@ #define G_LOG_DOMAIN "freeglut-geometry" #include "../include/GL/freeglut.h" -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" /* * TODO BEFORE THE STABLE RELEASE: diff --git a/freeglut-1.3/freeglut_init.c b/freeglut-1.3/freeglut_init.c index 720fb69..7fa7afa 100644 --- a/freeglut-1.3/freeglut_init.c +++ b/freeglut-1.3/freeglut_init.c @@ -32,7 +32,7 @@ #define G_LOG_DOMAIN "freeglut-init" #include "../include/GL/freeglut.h" -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" /* * TODO BEFORE THE STABLE RELEASE: @@ -367,8 +367,8 @@ void FGAPIENTRY glutInit( int* pargc, char** argv ) * This is harmless under Win32, so let's let it stay here... */ #if TARGET_HOST_WIN32 - if ( !getenv( "DISPLAY" ) ) - displayName = strdup( "" ); + if ( !getenv ( "DISPLAY" ) ) + displayName = strdup ( "" ) ; else #endif displayName = strdup( getenv( "DISPLAY" ) ); @@ -613,7 +613,7 @@ void FGAPIENTRY glutInitWindowSize( int width, int height ) /* * Sets the default display mode for all new windows */ -void FGAPIENTRY glutInitDisplayMode( int displayMode ) +void FGAPIENTRY glutInitDisplayMode( unsigned int displayMode ) { /* * We will make use of this value when creating a new OpenGL context... @@ -821,7 +821,7 @@ void FGAPIENTRY glutInitDisplayString( char* displayMode ) * Grab the value string that must follow the comparison operator... */ if( comparison != FG_NONE && i < (gint) strlen( scanner->value.v_identifier ) ) - valueString = g_strdup( scanner->value.v_identifier + i ); + valueString = strdup( scanner->value.v_identifier + i ); /* * If there was a value string, convert it to integer... @@ -923,7 +923,7 @@ static int TokenLengths[] = 10, 12 }; -void FGAPIENTRY glutInitDisplayString( char* displayMode ) +void FGAPIENTRY glutInitDisplayString( const char* displayMode ) { int glut_state_flag = 0 ; /* diff --git a/freeglut-1.3/freeglut_joystick.c b/freeglut-1.3/freeglut_joystick.c index 5012dfc..98f7efa 100644 --- a/freeglut-1.3/freeglut_joystick.c +++ b/freeglut-1.3/freeglut_joystick.c @@ -44,7 +44,7 @@ #define G_LOG_DOMAIN "freeglut-joystick" #include "../include/GL/freeglut.h" -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" /* * PWO: I don't like it at all. It's a mess. Could it be cleared? @@ -544,7 +544,7 @@ void fgJoystickClose( void ) #endif free ( fgJoystick ) ; - fgJoystick = NULL ; + fgJoystick = NULL ; // show joystick has been deinitialized } /* diff --git a/freeglut-1.3/freeglut_misc.c b/freeglut-1.3/freeglut_misc.c index 4dcfcea..496ca45 100644 --- a/freeglut-1.3/freeglut_misc.c +++ b/freeglut-1.3/freeglut_misc.c @@ -32,7 +32,7 @@ #define G_LOG_DOMAIN "freeglut-misc" #include "../include/GL/freeglut.h" -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" /* * TODO BEFORE THE STABLE RELEASE: diff --git a/freeglut-1.3/freeglut_overlay.c b/freeglut-1.3/freeglut_overlay.c index 6477744..14c42c2 100644 --- a/freeglut-1.3/freeglut_overlay.c +++ b/freeglut-1.3/freeglut_overlay.c @@ -32,7 +32,7 @@ #define G_LOG_DOMAIN "freeglut-overlay" #include "../include/GL/freeglut.h" -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" /* * NOTE: functions declared in this file probably will not be implemented. diff --git a/freeglut-1.3/freeglut_stroke_mono_roman.c b/freeglut-1.3/freeglut_stroke_mono_roman.c index a0b336b..1c6aa4f 100644 --- a/freeglut-1.3/freeglut_stroke_mono_roman.c +++ b/freeglut-1.3/freeglut_stroke_mono_roman.c @@ -1,7 +1,7 @@ /* This file has been automatically generated by the genstroke utility. */ -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" #ifdef TARGET_HOST_WIN32 #pragma warning ( once:4305 ) #endif diff --git a/freeglut-1.3/freeglut_stroke_roman.c b/freeglut-1.3/freeglut_stroke_roman.c index ca3b8df..c7ecd2b 100644 --- a/freeglut-1.3/freeglut_stroke_roman.c +++ b/freeglut-1.3/freeglut_stroke_roman.c @@ -1,7 +1,7 @@ /* This file has been automatically generated by the genstroke utility. */ -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" #ifdef TARGET_HOST_WIN32 #pragma warning ( once:4305 ) #endif diff --git a/freeglut-1.3/freeglut_teapot.c b/freeglut-1.3/freeglut_teapot.c index d910a08..03386b6 100644 --- a/freeglut-1.3/freeglut_teapot.c +++ b/freeglut-1.3/freeglut_teapot.c @@ -79,7 +79,7 @@ #define G_LOG_DOMAIN "freeglut-teapot" #include "../include/GL/freeglut.h" -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" /* -- PRIVATE FUNCTIONS ---------------------------------------------------- */ diff --git a/freeglut-1.3/freeglut_videoresize.c b/freeglut-1.3/freeglut_videoresize.c index d0a00ba..050dbe1 100644 --- a/freeglut-1.3/freeglut_videoresize.c +++ b/freeglut-1.3/freeglut_videoresize.c @@ -32,7 +32,7 @@ #define G_LOG_DOMAIN "freeglut-videoresize" #include "../include/GL/freeglut.h" -#include "../include/GL/freeglut_internal.h" +#include "freeglut_internal.h" /* * NOTE: functions declared in this file probably will not be implemented. -- 1.7.10.4