From 90f4f27adbf99410b9fa960969bcdba9d42a07cb Mon Sep 17 00:00:00 2001
From: "John F. Fay" <johnffay@nettally.com>
Date: Sun, 5 Feb 2012 00:52:55 +0000
Subject: [PATCH] Putting in changes recommended by Evan Felix to fix the X11
 build per e-mail dated 2/4/12 at 1:16 PM

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1049 7f0cb862-5218-0410-a997-914c9d46530a
---
 src/Common/freeglut_ext.c      |    2 +-
 src/Common/freeglut_joystick.c |    1 +
 src/Common/freeglut_window.c   |   14 +++++++-------
 src/Makefile.am                |    1 -
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Common/freeglut_ext.c b/src/Common/freeglut_ext.c
index 917839a..72bdaf9 100644
--- a/src/Common/freeglut_ext.c
+++ b/src/Common/freeglut_ext.c
@@ -204,7 +204,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
 
 
 #if TARGET_HOST_POSIX_X11
-static GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
+GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )
 {
     /* optimization: quick initial check */
     if( strncmp( procName, "glut", 4 ) != 0 )
diff --git a/src/Common/freeglut_joystick.c b/src/Common/freeglut_joystick.c
index 76f8542..8c23bba 100644
--- a/src/Common/freeglut_joystick.c
+++ b/src/Common/freeglut_joystick.c
@@ -1037,6 +1037,7 @@ void fgPlatformJoystickOpen( SFG_Joystick* joy )
        char *cp;
 #endif
 #ifdef JS_NEW
+	int i = 0;
        unsigned char u;
 #else
 #  if defined( __linux__ ) || TARGET_HOST_SOLARIS
diff --git a/src/Common/freeglut_window.c b/src/Common/freeglut_window.c
index 9b28940..cda8115 100644
--- a/src/Common/freeglut_window.c
+++ b/src/Common/freeglut_window.c
@@ -525,6 +525,13 @@ void fgPlatformSetWindow ( SFG_Window *window )
 }
 
 
+static Bool fghWindowIsVisible( Display *display, XEvent *event, XPointer arg)
+{
+    Window window = (Window)arg;
+    return (event->type == MapNotify) && (event->xmap.window == window);
+}
+
+
 /*
  * Opens a window. Requires a SFG_Window object created and attached
  * to the freeglut structure. OpenGL context is created here.
@@ -759,13 +766,6 @@ void fgPlatformCloseWindow( SFG_Window* window )
 }
 
 
-static Bool fghWindowIsVisible( Display *display, XEvent *event, XPointer arg)
-{
-    Window window = (Window)arg;
-    return (event->type == MapNotify) && (event->xmap.window == window);
-}
-
-
 
 
 /*
diff --git a/src/Makefile.am b/src/Makefile.am
index 893626c..eccdc21 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -20,7 +20,6 @@ lib@LIBRARY@_la_SOURCES = Common/freeglut_callbacks.c \
 			 Common/freeglut_display.c \
 			 Common/freeglut_ext.c \
 			 Common/freeglut_font.c \
-			 Common/freeglut_glutfont_definitions.c \
 			 Common/freeglut_font_data.c \
 			 Common/freeglut_stroke_roman.c \
 			 Common/freeglut_stroke_mono_roman.c \
-- 
1.7.10.4