Map-Server_SQL can't be compile!

[HaARiZz]

 

clif.c:14947: error: expected identifier or ‘(’ before ‘<<’ token

clif.c:16903: error: expected identifier or ‘(’ before ‘<<’ token

clif.c:16912: error: redefinition of ‘clif_parse_cashshop_open_request’

clif.c:14820: note: previous definition of ‘clif_parse_cashshop_open_request’ was here

clif.c:16916: error: redefinition of ‘clif_parse_cashshop_close’

clif.c:14825: note: previous definition of ‘clif_parse_cashshop_close’ was here

clif.c:16922: error: redefinition of ‘clif_parse_CashShopReqTab’

clif.c:14832: note: previous definition of ‘clif_parse_CashShopReqTab’ was here

clif.c:16944: error: redefinition of ‘clif_cashshop_list’

clif.c:14854: note: previous definition of ‘clif_cashshop_list’ was here

clif.c:16966: error: redefinition of ‘clif_parse_cashshop_list_request’

clif.c:14876: note: previous definition of ‘clif_parse_cashshop_list_request’ was here

clif.c:16995: error: expected identifier or ‘(’ before ‘==’ token

clif.c: In function ‘clif_parse_reqworldinfo’:

clif.c:17017: warning: implicit declaration of function ‘clif_ackworldinfo’

make[1]: *** [obj_sql/clif.o] Error 1

make[1]: Leaving directory `/home/PsychoRO/trunk/src/map'

make: *** [map] Error 2

 

Can someone help me with this error?

Before this everything okay, when i decide wanna make an svn update. I got this error.

Am i doing wrong method?

Firstly, i close server, then i type "svn update" at my terminal.

Then, i type "make clean", "./configure" and for the last is "make sql".

Unfortunately, i got this error. I hope that someone can lead me to fix this problem.

[chowking]

clif.c:14947: error: expected identifier or ‘(’ before ‘<<’ token

 

 

this line says you have to merge some conflicts so open your clif.c and go to the line number and start editing it manually, or just search <<<<<