From 38caacca2f3c1c010de0c359bc7d92b804cf3532 Mon Sep 17 00:00:00 2001 From: "John F. Fay" Date: Mon, 17 Nov 2008 14:50:08 +0000 Subject: [PATCH] Allowing "freeglut" to compile without errors under *nix. Before this, there were problems with conflicting definitions of the GLUT font definitions. git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@760 7f0cb862-5218-0410-a997-914c9d46530a --- src/freeglut_glutfont_definitions.c | 9 --------- src/freeglut_internal.h | 12 ++++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/src/freeglut_glutfont_definitions.c b/src/freeglut_glutfont_definitions.c index 60a987c..ab21d6b 100644 --- a/src/freeglut_glutfont_definitions.c +++ b/src/freeglut_glutfont_definitions.c @@ -54,15 +54,6 @@ struct freeglutStrokeFont float bottom ; }; -struct freeglutBitmapFont -{ - const char *name ; - const int num_chars ; - const int first ; - const void *ch ; -}; - - struct freeglutStrokeFont glutStrokeRoman ; struct freeglutStrokeFont glutStrokeMonoRoman ; diff --git a/src/freeglut_internal.h b/src/freeglut_internal.h index c48d79b..f7155d5 100644 --- a/src/freeglut_internal.h +++ b/src/freeglut_internal.h @@ -687,6 +687,18 @@ struct tagSFG_Font float xorig, yorig; /* Relative origin of the character */ }; +#if TARGET_HOST_POSIX_X11 + +struct freeglutBitmapFont +{ + const char *name ; + const int num_chars ; + const int first ; + const void *ch ; +}; + +#endif + /* The stroke font structures */ typedef struct tagSFG_StrokeVertex SFG_StrokeVertex; -- 1.7.10.4