? errors.txt ? s4.diff ? alpha.diff Index: client/gui-xaw/gui_main.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-xaw/gui_main.c,v retrieving revision 1.52 diff -u -r1.52 gui_main.c --- gui_main.c 2000/09/25 01:29:27 1.52 +++ gui_main.c 2000/10/13 09:43:38 @@ -384,8 +384,8 @@ } { - unsigned char d1[]={0x03,0x0c,0x03,0x0c}; - unsigned char d2[]={0x08,0x02,0x08,0x02}; + char d1[]={0x03,0x0c,0x03,0x0c}; + char d2[]={0x08,0x02,0x08,0x02}; gray50=XCreateBitmapFromData(display,root_window,d1,4,4); gray25=XCreateBitmapFromData(display,root_window,d2,4,4); } Index: client/include/cityicon.ico =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/include/cityicon.ico,v retrieving revision 1.1 diff -u -r1.1 cityicon.ico --- cityicon.ico 1999/04/13 10:53:14 1.1 +++ cityicon.ico 2000/10/13 09:43:38 @@ -1,6 +1,6 @@ #define cityicon_width 40 #define cityicon_height 40 -static unsigned char cityicon_bits[] = { +static char cityicon_bits[] = { 0x00,0x00,0x00,0x00,0x00,0x00,0xff,0x01,0x00,0x00,0x80,0xff,0x07,0x00,0x00, 0x00,0x2d,0x06,0x00,0x00,0x00,0x2d,0x06,0x00,0x00,0x80,0xff,0x07,0x00,0x00, 0x00,0x2d,0x06,0x00,0x00,0x00,0x2d,0x06,0x00,0x00,0x80,0xff,0x07,0x00,0x00, Index: client/include/drop_cursor.xbm =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/include/drop_cursor.xbm,v retrieving revision 1.1 diff -u -r1.1 drop_cursor.xbm --- drop_cursor.xbm 1999/09/23 12:09:13 1.1 +++ drop_cursor.xbm 2000/10/13 09:43:38 @@ -2,7 +2,7 @@ #define drop_cursor_height 27 #define drop_cursor_x_hot 13 #define drop_cursor_y_hot 25 -static unsigned char drop_cursor_bits[] = { +static char drop_cursor_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0x00, 0x00, 0x00, 0xff, 0x07, 0x00, 0xc0, 0xff, 0x1f, 0x00, 0xe0, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0xff, 0x00, 0xf8, 0xff, 0xff, 0x00, 0xfc, 0xff, 0xff, 0x01, 0xfe, 0xff, 0xff, 0x03, Index: client/include/drop_cursor_mask.xbm =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/include/drop_cursor_mask.xbm,v retrieving revision 1.1 diff -u -r1.1 drop_cursor_mask.xbm --- drop_cursor_mask.xbm 1999/09/23 12:09:14 1.1 +++ drop_cursor_mask.xbm 2000/10/13 09:43:38 @@ -1,6 +1,6 @@ #define drop_cursor_mask_width 27 #define drop_cursor_mask_height 27 -static unsigned char drop_cursor_mask_bits[] = { +static char drop_cursor_mask_bits[] = { 0x00, 0xfc, 0x01, 0x00, 0x80, 0xff, 0x0f, 0x00, 0xe0, 0xff, 0x3f, 0x00, 0xf0, 0xff, 0x7f, 0x00, 0xfc, 0xff, 0xff, 0x01, 0xfc, 0xff, 0xff, 0x01, 0xfe, 0xff, 0xff, 0x03, 0xff, 0xff, 0xff, 0x07, 0xff, 0xff, 0xff, 0x07, Index: client/include/freeciv.ico =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/include/freeciv.ico,v retrieving revision 1.3 diff -u -r1.3 freeciv.ico --- freeciv.ico 2000/02/28 21:00:01 1.3 +++ freeciv.ico 2000/10/13 09:43:38 @@ -1,6 +1,6 @@ #define freeciv_width 40 #define freeciv_height 40 -static unsigned char freeciv_bits[] = { +static char freeciv_bits[] = { 0x00,0x80,0xff,0x01,0x00,0x00,0xf0,0xd7,0x0f,0x00,0x00,0xbc,0x54,0x3e,0x00, 0x00,0x4a,0x92,0x54,0x00,0x80,0x25,0x92,0xa8,0x01,0x40,0x22,0x92,0x48,0x02, 0x20,0x11,0x11,0x91,0x04,0x90,0x08,0x11,0x21,0x09,0x90,0x08,0x11,0x21,0x09, Index: client/include/goto_cursor.xbm =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/include/goto_cursor.xbm,v retrieving revision 1.2 diff -u -r1.2 goto_cursor.xbm --- goto_cursor.xbm 1999/09/23 12:09:14 1.2 +++ goto_cursor.xbm 2000/10/13 09:43:38 @@ -2,7 +2,7 @@ #define goto_cursor_height 27 #define goto_cursor_x_hot 25 #define goto_cursor_y_hot 1 -static unsigned char goto_cursor_bits[] = { +static char goto_cursor_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0xfc, 0x03, 0x00, 0x80, 0x07, 0x03, 0x00, 0xc0, 0x01, 0x01, 0x00, 0x00, 0x0f, 0x01, 0x00, 0x00, 0x1b, 0x01, 0x00, 0xc0, 0x39, 0x01, 0x00, 0x70, 0xa4, 0x01, Index: client/include/goto_cursor_mask.xbm =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/include/goto_cursor_mask.xbm,v retrieving revision 1.2 diff -u -r1.2 goto_cursor_mask.xbm --- goto_cursor_mask.xbm 1999/09/23 12:09:14 1.2 +++ goto_cursor_mask.xbm 2000/10/13 09:43:38 @@ -1,6 +1,6 @@ #define goto_cursor_mask_width 27 #define goto_cursor_mask_height 27 -static unsigned char goto_cursor_mask_bits[] = { +static char goto_cursor_mask_bits[] = { 0x00, 0x00, 0xc0, 0x07, 0x00, 0x00, 0xfe, 0x07, 0x00, 0xc0, 0xff, 0x07, 0x00, 0xe0, 0xff, 0x07, 0x00, 0xe0, 0x9f, 0x07, 0x00, 0xe0, 0xbf, 0x03, 0x00, 0xe0, 0xff, 0x03, 0x00, 0xf8, 0xff, 0x03, 0x00, 0xfe, 0xff, 0x03, Index: client/include/nuke_cursor.xbm =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/include/nuke_cursor.xbm,v retrieving revision 1.1 diff -u -r1.1 nuke_cursor.xbm --- nuke_cursor.xbm 1999/09/23 12:09:14 1.1 +++ nuke_cursor.xbm 2000/10/13 09:43:38 @@ -2,7 +2,7 @@ #define nuke_cursor_height 27 #define nuke_cursor_x_hot 13 #define nuke_cursor_y_hot 13 -static unsigned char nuke_cursor_bits[] = { +static char nuke_cursor_bits[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x70, 0x00, 0x00, 0x00, 0x8e, 0x03, 0x00, 0x80, 0xfd, 0x0d, 0x00, 0x60, 0x23, 0x36, 0x00, 0xd0, 0x20, 0x58, 0x00, 0x30, 0x00, 0x60, 0x00, 0x28, 0xf8, 0xa0, 0x00, 0x18, 0xbe, 0xc3, 0x00, Index: client/include/nuke_cursor_mask.xbm =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/include/nuke_cursor_mask.xbm,v retrieving revision 1.1 diff -u -r1.1 nuke_cursor_mask.xbm --- nuke_cursor_mask.xbm 1999/09/23 12:09:14 1.1 +++ nuke_cursor_mask.xbm 2000/10/13 09:43:38 @@ -2,7 +2,7 @@ #define nuke_cursor_mask_height 27 #define nuke_cursor_mask_x_hot 13 #define nuke_cursor_mask_y_hot 13 -static unsigned char nuke_cursor_mask_bits[] = { +static char nuke_cursor_mask_bits[] = { 0x00, 0xfc, 0x01, 0x00, 0x80, 0xff, 0x0f, 0x00, 0xc0, 0xff, 0x1f, 0x00, 0xe0, 0xff, 0x3f, 0x00, 0xf0, 0xff, 0x7f, 0x00, 0xf8, 0x77, 0xff, 0x00, 0xfc, 0xfd, 0xfd, 0x01, 0x7e, 0xff, 0xf7, 0x03, 0xfe, 0xff, 0xff, 0x03, Index: server/unitfunc.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/unitfunc.c,v retrieving revision 1.208 diff -u -r1.208 unitfunc.c --- unitfunc.c 2000/10/09 19:37:22 1.208 +++ unitfunc.c 2000/10/13 09:43:39 @@ -1975,7 +1975,7 @@ B_COASTAL, B_OFFSHORE }; - #define coastal_improvements_count \ +#define coastal_improvements_count \ (sizeof(coastal_improvements)/sizeof(coastal_improvements[0])) int i, j, k;