[Freeciv-Dev] (PR#40035) [Patch] Fix S2_2 xaw compilation

2008-01-22 Thread Marko Lindqvist 

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40035 

 These includes fix S2_2 xaw-client compilation (that doesn't
necessarily mean that resulting binary is any way usable - xaw-client
wasn't when I last tested last autumn). Fixing TRUNK compilation will
require more than that.


 - ML

diff -Nurd -X.diff_ignore freeciv/client/gui-xaw/citydlg.c freeciv/client/gui-xaw/citydlg.c
--- freeciv/client/gui-xaw/citydlg.c	2008-01-15 04:53:49.0 +0200
+++ freeciv/client/gui-xaw/citydlg.c	2008-01-22 14:13:56.0 +0200
@@ -32,6 +32,7 @@
 #include X11/Xaw/Toggle.h 
 #include X11/IntrinsicP.h
 
+/* utility */
 
 #include fcintl.h
 #include mem.h
@@ -39,12 +40,15 @@
 #include shared.h
 #include support.h
 
+/* common */
+
 #include city.h
 #include connection.h	/* can_conn_edit */
 #include game.h
 #include map.h
 #include packets.h
 #include player.h
+#include specialist.h
 #include unitlist.h
 
 #include civclient.h
diff -Nurd -X.diff_ignore freeciv/client/gui-xaw/menu.c freeciv/client/gui-xaw/menu.c
--- freeciv/client/gui-xaw/menu.c	2008-01-15 04:53:49.0 +0200
+++ freeciv/client/gui-xaw/menu.c	2008-01-22 14:14:21.0 +0200
@@ -25,11 +25,16 @@
 #include X11/Xaw/SmeBSB.h
 #include X11/Xaw/SmeLine.h
 
+/* utility */
+
 #include fcintl.h
 #include mem.h
 #include movement.h
 #include support.h
 
+/* common */
+
+#include game.h
 #include government.h
 #include map.h
 #include unit.h
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Re: [Freeciv-Dev] (PR#40035) [Patch] Fix S2_2 xaw compilation

2008-01-22 Thread Egor Vyscrebentsov 

URL: http://bugs.freeciv.org/Ticket/Display.html?id=40035 

On Tue, 22 Jan 2008 Marko Lindqvist wrote:

  These includes fix S2_2 xaw-client compilation (that doesn't
 necessarily mean that resulting binary is any way usable - xaw-client
 wasn't when I last tested last autumn).

It (patched client) works at least on i*86. Commited (r14280).

 Fixing TRUNK compilation will require more than that.

Will look right now.

-- 
Thanks, evyscr



___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev