[Freeciv-Dev] cid code -> broken CVS tree?

[Justin Moore <justin@xxxxxxxxxxx>]

   After a 'cvs up' that grabbed the climisc.[ch] files, I now get this
when I try to compile:

gcc -DHAVE_CONFIG_H -I. -I. -I../.. -I. -I./.. -I./../include -I../../common
-I../../intl -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2
-I/usr/lib/glib/include -I/usr/X11R6/include -I/usr/X11R6/include    -g
-O2 -Wall -c cityrep.c
In file included from cityrep.c:44:
../climisc.h:25: parse error before `x'
../climisc.h:51: parse error before `cid_encode'
../climisc.h:51: warning: type defaults to `int' in declaration of `cid_encode'
../climisc.h:51: warning: data definition has no type or storage class
../climisc.h:52: parse error before `cid_encode_from_city'
../climisc.h:52: warning: type defaults to `int' in declaration of 
`cid_encode_from_city'
../climisc.h:52: warning: data definition has no type or storage class
../climisc.h:53: parse error before `cid'
../climisc.h:54: parse error before `cid'
../climisc.h:55: parse error before `cid'
../climisc.h:57: parse error before `cid'
../climisc.h:58: parse error before `cid'
../climisc.h:59: parse error before `cid'
cityrep.c: In function `select_impr_or_unit_callback':
cityrep.c:290: `cid' undeclared (first use in this function)
cityrep.c:290: (Each undeclared identifier is reported only once
cityrep.c:290: for each function it appears in.)
cityrep.c:290: parse error before `cid'

   My tree seems to be current.  I can't find where you define a 'cid'.
Fixes?

-jdm

Department of Computer Science, Duke University, Durham, NC 27708-0129
Email:  justin@xxxxxxxxxxx