[Xastir-dev] compile problems from CVS?

[Tom Russo]

On Sat, Dec 06, 2003 at 09:58:55AM -0600, a Mr. Richard Feyler of Fort Lee, New Jersey <gerry.creager at tamu.edu> writes 'Dear Rosanne Rosannadanna':
> Last couple of times I'd done a cvs update (appeared normal) and then 
> tried to compile, it's blown up.
> 
> Here's the last little bit of the error stuff...
> 
> gcc -DHAVE_CONFIG_H -I. -I. -I..   -I/usr/local/include 
> -I/usr/X11R6/include -I/usr/include -I/usr/include/freetype2 
> -D_FILE_OFFSET_BITS=64 -D_REENTRANT -I/usr/include/libxml2 
> -DXASTIR_DATA_BASE=\"/usr/local/share/xastir\"  -g -O2 -pipe -Wall 
> -pthread -c `test -f 'main.c' || echo './'`main.c
> main.c: In function `UpdateTime':
> main.c:9229: parse error before '<<' token
> make[2]: *** [main.o] Error 1
> make[2]: Leaving directory `/home/gerry/xastir/src'
> make[1]: *** [all-recursive] Error 1
> make[1]: Leaving directory `/home/gerry/xastir'
> make: *** [all] Error 2

Looks suspiciously like a CVS conflict.

You edited "nexttime=1" the othere day, right?  When Curt committed the
same change, CVS probably placed warnings into the file about the conflict,
and those are delimited by "<<<<" and such.

Try removing main.c and doing a CVS update, or go into main.c and edit out
the conflict warning lines if you have more local changes you want to keep.

-- 
Tom Russo    KM5VY   SAR502   DM64ux          http://www.swcp.com/~russo/
Tijeras, NM  QRPL#1592 K2#398  SOC#236 AHTB#1 http://www.qsl.net/~km5vy/
 echo "prpv_a'rfg_cnf_har_cvcr" | sed -e 's/_/ /g' | tr [a-m][n-z] [n-z][a-m]