Putting in changes recommended by Evan Felix to fix the X11 build per e-mail dated...

git-svn-id: svn+ssh://svn.code.sf.net/p/freeglut/code/trunk/freeglut/freeglut@1049 7f0cb862-5218-0410-a997-914c9d46530a

diff --git a/src/Common/freeglut_ext.c b/src/Common/freeglut_ext.c
index 917839a..72bdaf9 100644 (file)
--- a/src/Common/freeglut_ext.c
+++ b/src/Common/freeglut_ext.c
@@ -204,7 +204,7 @@ static GLUTproc fghGetGLUTProcAddress( const char* procName )
 \r
 \r
 #if TARGET_HOST_POSIX_X11\r
-static GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )\r
+GLUTproc fgPlatformGetGLUTProcAddress( const char* procName )\r
 {\r
     /* optimization: quick initial check */\r
     if( strncmp( procName, "glut", 4 ) != 0 )\r

diff --git a/src/Common/freeglut_joystick.c b/src/Common/freeglut_joystick.c
index 76f8542..8c23bba 100644 (file)
--- a/src/Common/freeglut_joystick.c
+++ b/src/Common/freeglut_joystick.c
@@ -1037,6 +1037,7 @@ void fgPlatformJoystickOpen( SFG_Joystick* joy )
        char *cp;\r
 #endif\r
 #ifdef JS_NEW\r
+       int i = 0;\r
        unsigned char u;\r
 #else\r
 #  if defined( __linux__ ) || TARGET_HOST_SOLARIS\r

diff --git a/src/Common/freeglut_window.c b/src/Common/freeglut_window.c
index 9b28940..cda8115 100644 (file)
--- a/src/Common/freeglut_window.c
+++ b/src/Common/freeglut_window.c
@@ -525,6 +525,13 @@ void fgPlatformSetWindow ( SFG_Window *window )
 }\r
 \r
 \r
+static Bool fghWindowIsVisible( Display *display, XEvent *event, XPointer arg)\r
+{\r
+    Window window = (Window)arg;\r
+    return (event->type == MapNotify) && (event->xmap.window == window);\r
+}\r
+\r
+\r
 /*\r
  * Opens a window. Requires a SFG_Window object created and attached\r
  * to the freeglut structure. OpenGL context is created here.\r
@@ -759,13 +766,6 @@ void fgPlatformCloseWindow( SFG_Window* window )
 }\r
 \r
 \r
-static Bool fghWindowIsVisible( Display *display, XEvent *event, XPointer arg)\r
-{\r
-    Window window = (Window)arg;\r
-    return (event->type == MapNotify) && (event->xmap.window == window);\r
-}\r
-\r
-\r
 \r
 \r
 /*\r

diff --git a/src/Makefile.am b/src/Makefile.am
index 893626c..eccdc21 100644 (file)
--- 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 \