Problem with compile from new CVS files

[Jargon]

Getting this:


In file included from interface.h:32,
from main.cpp:39:
everquest.h:475:2: invalid preprocessing directive #<<
In file included from interface.h:32,
from main.cpp:39:
everquest.h:477: error: syntax error before `==' token
everquest.h:479:2: invalid preprocessing directive #>>
make[3]: *** [main.o] Error 1
make[3]: Leaving directory `/root/showeq/src'
make[2]: *** [all] Error 2
make[2]: Leaving directory `/root/showeq/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/root/showeq'
make: *** [all] Error 2

Never seen it before, usually works like a charm. Help?

[Alethal]

delete the files, try to get them again from CVS.

[purple]

You hand edited everquest.h at some point and now CVS is trying to merge down what was in the repository with what you hand edited and there was a conflct. Watch for C src/everquest.h or whatnot when you do the update and you'll know when this happens.

[ksmith]

You could have just linked to this thread.

[Jargon]

Thanks! Working now.

Must have missed that thread :/

Cheers!