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

diff --git a/src/freeglut_glutfont_definitions.c b/src/freeglut_glutfont_definitions.c
index 7cb34f8..8154774 100644 (file)
--- 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 (file)
--- a/src/freeglut_internal.h
+++ b/src/freeglut_internal.h
@@ -89,11 +89,9 @@
     #include <X11/Xatom.h>
     #include <X11/keysym.h>
 
-    #ifndef __sgi
-    #ifndef SOLARIS
+    #if HAVE_X11_EXTENSIONS_XF86VMODE_H
     #include <X11/extensions/xf86vmode.h>
     #endif
-    #endif
 #endif
 
 /*