[Freeciv-Dev] (PR#11276) [C++] client/tilespec.h refers to an enum constant out of scope

["Frédéric Brière" <fbriere@xxxxxxxxxxx>]

<URL: http://rt.freeciv.org/Ticket/Display.html?id=11276 >

C++ defines structures as having their own scope; this patch fixes a
reference to an enumeration constant from outside the scope of its
enclosing structure.  (The structure itself is defined in
client/citydlg_common.h)


-- 
             Frédéric Brière    <*>    fbriere@xxxxxxxxxxx

 =>  <fbriere@xxxxxxxxxx> IS NO MORE:  <http://www.abacomsucks.com>  <=

Index: client/tilespec.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/tilespec.h,v
retrieving revision 1.91
diff -u -r1.91 tilespec.h
--- client/tilespec.h   20 Nov 2004 17:45:52 -0000      1.91
+++ client/tilespec.h   1 Dec 2004 07:59:41 -0000
@@ -96,7 +96,11 @@
 #define MAX_INDEX_VALID                        256
 
 #define NUM_TILES_PROGRESS 8
+#ifdef __cplusplus
+#define NUM_TILES_CITIZEN citizen_type::CITIZEN_LAST
+#else
 #define NUM_TILES_CITIZEN CITIZEN_LAST
+#endif
 #define NUM_TILES_HP_BAR 11
 #define NUM_TILES_DIGITS 10
 #define MAX_NUM_CITIZEN_SPRITES 6