[Freeciv-Dev] (PR#12459) CVS compiling error: unresolvable relocation

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=12459 >

It's unlikely, but do either of these patches help the problem?  (You
may already have tested the second one, I forget.)

-jason

Index: client/gui-gtk-2.0/graphics.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/graphics.h,v
retrieving revision 1.13
diff -u -r1.13 graphics.h
--- client/gui-gtk-2.0/graphics.h       3 Mar 2005 03:47:31 -0000       1.13
+++ client/gui-gtk-2.0/graphics.h       11 Mar 2005 06:45:39 -0000
@@ -39,7 +39,7 @@
 
 extern SPRITE *    intro_gfx_sprite;
 extern SPRITE *    radar_gfx_sprite;
-extern GdkCursor *cursors[CURSOR_LAST];
+extern GdkCursor *cursors[];
 
 void gtk_draw_shadowed_string(GdkDrawable *drawable,
                              GdkGC *black_gc,

Index: client/gui-gtk-2.0/graphics.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/graphics.c,v
retrieving revision 1.37
diff -u -r1.37 graphics.c
--- client/gui-gtk-2.0/graphics.c       3 Mar 2005 03:47:31 -0000       1.37
+++ client/gui-gtk-2.0/graphics.c       11 Mar 2005 06:14:39 -0000
@@ -43,7 +43,7 @@
 SPRITE *               intro_gfx_sprite;
 SPRITE *               radar_gfx_sprite;
 
-GdkCursor *cursors[CURSOR_LAST];
+GdkCursor *fc_cursors[CURSOR_LAST];
 
 /***************************************************************************
 ...
@@ -190,7 +190,7 @@
     struct Sprite *sprite = get_cursor_sprite(cursor, &hot_x, &hot_y);
     GdkPixbuf *pixbuf = sprite_get_pixbuf(sprite);
 
-    cursors[cursor] = gdk_cursor_new_from_pixbuf(display, pixbuf,
+    fc_cursors[cursor] = gdk_cursor_new_from_pixbuf(display, pixbuf,
                                                 hot_x, hot_y);
   }
 }
Index: client/gui-gtk-2.0/graphics.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/graphics.h,v
retrieving revision 1.13
diff -u -r1.13 graphics.h
--- client/gui-gtk-2.0/graphics.h       3 Mar 2005 03:47:31 -0000       1.13
+++ client/gui-gtk-2.0/graphics.h       11 Mar 2005 06:14:39 -0000
@@ -39,7 +39,7 @@
 
 extern SPRITE *    intro_gfx_sprite;
 extern SPRITE *    radar_gfx_sprite;
-extern GdkCursor *cursors[CURSOR_LAST];
+extern GdkCursor *fc_cursors[CURSOR_LAST];
 
 void gtk_draw_shadowed_string(GdkDrawable *drawable,
                              GdkGC *black_gc,
Index: client/gui-gtk-2.0/mapview.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/gui-gtk-2.0/mapview.c,v
retrieving revision 1.163
diff -u -r1.163 mapview.c
--- client/gui-gtk-2.0/mapview.c        5 Mar 2005 23:43:59 -0000       1.163
+++ client/gui-gtk-2.0/mapview.c        11 Mar 2005 06:14:39 -0000
@@ -190,17 +190,17 @@
       gdk_window_set_cursor (root_window, NULL);
       break;
     case HOVER_PATROL:
-      gdk_window_set_cursor(root_window, cursors[CURSOR_PATROL]);
+      gdk_window_set_cursor(root_window, fc_cursors[CURSOR_PATROL]);
       break;
     case HOVER_GOTO:
     case HOVER_CONNECT:
-      gdk_window_set_cursor(root_window, cursors[CURSOR_GOTO]);
+      gdk_window_set_cursor(root_window, fc_cursors[CURSOR_GOTO]);
       break;
     case HOVER_NUKE:
-      gdk_window_set_cursor(root_window, cursors[CURSOR_NUKE]);
+      gdk_window_set_cursor(root_window, fc_cursors[CURSOR_NUKE]);
       break;
     case HOVER_PARADROP:
-      gdk_window_set_cursor(root_window, cursors[CURSOR_PARADROP]);
+      gdk_window_set_cursor(root_window, fc_cursors[CURSOR_PARADROP]);
       break;
     }
   } else {