From fee0adb5bcfe989d4b9702f104008250a588902d Mon Sep 17 00:00:00 2001 From: Christopher John Purnell Date: Sat, 2 Aug 2003 19:53:56 +0000 Subject: [PATCH] Putting stuff back that was undone with the menu code committed. git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@153 7f0cb862-5218-0410-a997-914c9d46530a --- src/freeglut_glutfont_definitions.c | 18 +++++++++--------- src/freeglut_internal.h | 4 +--- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/freeglut_glutfont_definitions.c b/src/freeglut_glutfont_definitions.c index 7cb34f8..8154774 100644 --- a/src/freeglut_glutfont_definitions.c +++ b/src/freeglut_glutfont_definitions.c @@ -61,16 +61,16 @@ struct freeglutBitmapFont } ; -struct freeglutStrokeFont *glutStrokeRoman ; -struct freeglutStrokeFont *glutStrokeMonoRoman ; +struct freeglutStrokeFont glutStrokeRoman ; +struct freeglutStrokeFont glutStrokeMonoRoman ; -struct freeglutBitmapFont *glutBitmap9By15 ; -struct freeglutBitmapFont *glutBitmap8By13 ; -struct freeglutBitmapFont *glutBitmapTimesRoman10 ; -struct freeglutBitmapFont *glutBitmapTimesRoman24 ; -struct freeglutBitmapFont *glutBitmapHelvetica10 ; -struct freeglutBitmapFont *glutBitmapHelvetica12 ; -struct freeglutBitmapFont *glutBitmapHelvetica18 ; +struct freeglutBitmapFont glutBitmap9By15 ; +struct freeglutBitmapFont glutBitmap8By13 ; +struct freeglutBitmapFont glutBitmapTimesRoman10 ; +struct freeglutBitmapFont glutBitmapTimesRoman24 ; +struct freeglutBitmapFont glutBitmapHelvetica10 ; +struct freeglutBitmapFont glutBitmapHelvetica12 ; +struct freeglutBitmapFont glutBitmapHelvetica18 ; #endif diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h index 26ee0c2..48489c5 100644 --- a/src/freeglut_internal.h +++ b/src/freeglut_internal.h @@ -89,11 +89,9 @@ #include #include - #ifndef __sgi - #ifndef SOLARIS + #if HAVE_X11_EXTENSIONS_XF86VMODE_H #include #endif - #endif #endif /* -- 1.7.10.4