Index: client/climisc.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/climisc.h,v
retrieving revision 1.51
diff -u -r1.51 climisc.h
--- client/climisc.h	29 Sep 2004 02:24:19 -0000	1.51
+++ client/climisc.h	2 Dec 2004 00:46:55 -0000
@@ -78,7 +78,11 @@
 bool city_building_present(struct city *pcity, cid cid);
 
 struct item {
+#ifdef __cplusplus
+  ::cid cid;
+#else
   cid cid;
+#endif
   char descr[MAX_LEN_NAME + 40];
 
   /* Privately used for sorting */