Putting stuff back that was undone with the menu code committed.

git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@153 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
cjp 2003-08-02 19:53:56 +00:00
parent fc93453910
commit 5e6391f52b
2 changed files with 10 additions and 12 deletions

View File

@ -61,16 +61,16 @@ struct freeglutBitmapFont
} ; } ;
struct freeglutStrokeFont *glutStrokeRoman ; struct freeglutStrokeFont glutStrokeRoman ;
struct freeglutStrokeFont *glutStrokeMonoRoman ; struct freeglutStrokeFont glutStrokeMonoRoman ;
struct freeglutBitmapFont *glutBitmap9By15 ; struct freeglutBitmapFont glutBitmap9By15 ;
struct freeglutBitmapFont *glutBitmap8By13 ; struct freeglutBitmapFont glutBitmap8By13 ;
struct freeglutBitmapFont *glutBitmapTimesRoman10 ; struct freeglutBitmapFont glutBitmapTimesRoman10 ;
struct freeglutBitmapFont *glutBitmapTimesRoman24 ; struct freeglutBitmapFont glutBitmapTimesRoman24 ;
struct freeglutBitmapFont *glutBitmapHelvetica10 ; struct freeglutBitmapFont glutBitmapHelvetica10 ;
struct freeglutBitmapFont *glutBitmapHelvetica12 ; struct freeglutBitmapFont glutBitmapHelvetica12 ;
struct freeglutBitmapFont *glutBitmapHelvetica18 ; struct freeglutBitmapFont glutBitmapHelvetica18 ;
#endif #endif

View File

@ -89,11 +89,9 @@
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/keysym.h> #include <X11/keysym.h>
#ifndef __sgi #if HAVE_X11_EXTENSIONS_XF86VMODE_H
#ifndef SOLARIS
#include <X11/extensions/xf86vmode.h> #include <X11/extensions/xf86vmode.h>
#endif #endif
#endif
#endif #endif
/* /*