diff -r freeciv-1.8.0.new/client/optiondlg.c freeciv-1.8.0/client/optiondlg.c
361c361
<   unsigned char *s;
---
>   char *s;
diff -r freeciv-1.8.0.new/client/xmain.c freeciv-1.8.0/client/xmain.c
316c316
<       sprintf(name+9, "%05i",(int) getuid());
---
>       sprintf(name+9, "%05i",getuid());
diff -r freeciv-1.8.0.new/common/capability.c freeciv-1.8.0/common/capability.c
30c30
<   unsigned char *capstr_, *token, *next;
---
>   char *capstr_, *token, *next;
diff -r freeciv-1.8.0.new/server/maphand.c freeciv-1.8.0/server/maphand.c
437c437
<       unsigned char ch=terline[x];
---
>       char ch=terline[x];
456c456
<       unsigned char ch=terline[x];
---
>       char ch=terline[x];
472c472
<       unsigned char ch=terline[x];
---
>       char ch=terline[x];
489c489
<       unsigned char ch=terline[x];
---
>       char ch=terline[x];
504c504
<       unsigned char ch=terline[x];
---
>       char ch=terline[x];
519c519
<       unsigned char ch=terline[x];
---
>       char ch=terline[x];
diff -r freeciv-1.8.0.new/server/registry.c freeciv-1.8.0/server/registry.c
277c277
<   unsigned char *cptr=buffer, *start;
---
>   char *cptr=buffer, *start;
388c388
<     unsigned char *cptr;
---
>     char *cptr;
569c569
< 	unsigned char *c, *first, base[64];
---
> 	char *c, *first, base[64];
diff -r freeciv-1.8.0.new/server/stdinhand.c freeciv-1.8.0/server/stdinhand.c
748c748
<   unsigned char command[512], *cptr_s, *cptr_d;
---
>   char command[512], *cptr_s, *cptr_d;
921c921
<   unsigned char command[512], arg[512], *cptr_s, *cptr_d;
---
>   char command[512], arg[512], *cptr_s, *cptr_d;
978c978
<   unsigned char command[512], arg[512], *cptr_s, *cptr_d;
---
>   char command[512], arg[512], *cptr_s, *cptr_d;
diff -r freeciv-1.8.0.new/server/unithand.c freeciv-1.8.0/server/unithand.c
991c991
<        is_tiles_adjacent(punit->x, punit->y, pcity_dest->x, pcity_dest->y)) {
---
>        is_tiles_adjacent(punit->x, punit->y, pcity_dest->x, pcity_dest->y)) 
1011d1010
<     }