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

 $subject


 - ML

diff -Nurd -X.diff_ignore freeciv/client/gui-ftwl/gui_text.c 
freeciv/client/gui-ftwl/gui_text.c
--- freeciv/client/gui-ftwl/gui_text.c  2008-03-12 22:42:04.000000000 +0200
+++ freeciv/client/gui-ftwl/gui_text.c  2008-08-29 18:13:20.000000000 +0300
@@ -145,11 +145,11 @@
   add_line(_("Location: (%d, %d) [%d]"),
           TILE_XY(ptile),
           tile_continent(ptile));
-#endif
+#endif /* DEBUG */
   add_line("%s", tile_get_info_text(ptile, 0));
   if (count > 0) {
     add_line("%s",
-            get_infrastructure_text(infrastructure));
+            get_infrastructure_text(infrastructure, ptile->bases));
   }
   RETURN;
 }
diff -Nurd -X.diff_ignore freeciv/utility/ftwl/be_sdl.c 
freeciv/utility/ftwl/be_sdl.c
--- freeciv/utility/ftwl/be_sdl.c       2008-02-02 09:34:48.000000000 +0200
+++ freeciv/utility/ftwl/be_sdl.c       2008-08-29 18:15:34.000000000 +0300
@@ -193,7 +193,7 @@
       zero_timeout.tv_sec = 0;
       zero_timeout.tv_usec = 0;
 
-      ret = my_select(other_fd + 1, &readfds, NULL, &exceptfds, &zero_timeout);
+      ret = fc_select(other_fd + 1, &readfds, NULL, &exceptfds, &zero_timeout);
       if (ret > 0 && (FD_ISSET(other_fd, &readfds) ||
                      FD_ISSET(other_fd, &exceptfds))) {
        event->type = BE_DATA_OTHER_FD;
diff -Nurd -X.diff_ignore freeciv/utility/ftwl/be_x11_cairo_32.c 
freeciv/utility/ftwl/be_x11_cairo_32.c
--- freeciv/utility/ftwl/be_x11_cairo_32.c      2007-09-14 14:44:12.000000000 
+0300
+++ freeciv/utility/ftwl/be_x11_cairo_32.c      2008-08-29 18:14:37.000000000 
+0300
@@ -252,7 +252,7 @@
     }
   }
 
-  ret = my_select(highest + 1, &readfds, NULL, &exceptfds, timeout);
+  ret = fc_select(highest + 1, &readfds, NULL, &exceptfds, timeout);
   if (ret == 0) {
     // timed out
     event->type = BE_TIMEOUT;
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to