Index: external/gtk-1.2/gtk/gtkbordercombo.c =================================================================== RCS file: /sources/tsp/tsp/external/gtk-1.2/gtk/gtkbordercombo.c,v retrieving revision 1.1 diff -u -r1.1 gtkbordercombo.c --- external/gtk-1.2/gtk/gtkbordercombo.c 17 Nov 2007 14:31:31 -0000 1.1 +++ external/gtk-1.2/gtk/gtkbordercombo.c 17 Nov 2007 19:18:54 -0000 @@ -39,7 +39,7 @@ LAST_SIGNAL }; -static gint border_combo_signals[LAST_SIGNAL] = {0}; +static guint border_combo_signals[LAST_SIGNAL] = {0}; static char *xpm_border[]={ Index: external/gtk-1.2/gtk/gtkcolorcombo.c =================================================================== RCS file: /sources/tsp/tsp/external/gtk-1.2/gtk/gtkcolorcombo.c,v retrieving revision 1.1 diff -u -r1.1 gtkcolorcombo.c --- external/gtk-1.2/gtk/gtkcolorcombo.c 17 Nov 2007 14:31:31 -0000 1.1 +++ external/gtk-1.2/gtk/gtkcolorcombo.c 17 Nov 2007 19:18:54 -0000 @@ -42,7 +42,7 @@ LAST_SIGNAL }; -static gint color_combo_signals[LAST_SIGNAL] = {0}; +static guint color_combo_signals[LAST_SIGNAL] = {0}; static char *default_colors[]={ Index: external/gtk-1.2/gtk/gtkitementry.c =================================================================== RCS file: /sources/tsp/tsp/external/gtk-1.2/gtk/gtkitementry.c,v retrieving revision 1.1 diff -u -r1.1 gtkitementry.c --- external/gtk-1.2/gtk/gtkitementry.c 17 Nov 2007 14:31:33 -0000 1.1 +++ external/gtk-1.2/gtk/gtkitementry.c 17 Nov 2007 19:18:55 -0000 @@ -1416,7 +1416,7 @@ gint max_length; gint i; - guchar *new_text_nt; + gchar *new_text_nt; gint insertion_length; GdkWChar *insertion_text; @@ -1473,7 +1473,7 @@ else for (insertion_length=0; new_text_nt[insertion_length]; insertion_length++) insertion_text[insertion_length] = new_text_nt[insertion_length]; - if (new_text_nt != (guchar *)new_text) + if (new_text_nt != new_text) g_free (new_text_nt); /* Make sure we do not exceed the maximum size of the entry. */ @@ -1629,7 +1629,7 @@ if (start_pos <= end_pos) { - guchar *mbstr; + gchar *mbstr; if (entry->use_wchar) { GdkWChar ch; Index: external/gtk-1.2/gtk/gtkplotgdk.c =================================================================== RCS file: /sources/tsp/tsp/external/gtk-1.2/gtk/gtkplotgdk.c,v retrieving revision 1.1 diff -u -r1.1 gtkplotgdk.c --- external/gtk-1.2/gtk/gtkplotgdk.c 17 Nov 2007 14:31:34 -0000 1.1 +++ external/gtk-1.2/gtk/gtkplotgdk.c 17 Nov 2007 19:18:55 -0000 @@ -326,7 +326,7 @@ gint num_values) { gchar list[] = {'\0','\1','\2','\3','\4','\5','\6','\7'}; - gchar dash[1000] = ""; + gint8 dash[1000] = ""; gint i; if(!GTK_PLOT_GDK(pc)->gc) return; Index: external/gtk-1.2/gtk/gtksheet.c =================================================================== RCS file: /sources/tsp/tsp/external/gtk-1.2/gtk/gtksheet.c,v retrieving revision 1.1 diff -u -r1.1 gtksheet.c --- external/gtk-1.2/gtk/gtksheet.c 17 Nov 2007 14:31:36 -0000 1.1 +++ external/gtk-1.2/gtk/gtksheet.c 17 Nov 2007 19:18:58 -0000 @@ -1835,6 +1835,7 @@ GtkSheet *sheet; gint x,y,width,height; GdkRectangle clip_area; + gint8 dashes[2] = { 4, 4}; sheet=GTK_SHEET(data); @@ -1901,9 +1902,9 @@ sheet->interval=sheet->interval+1; if(sheet->interval==TIME_INTERVAL) sheet->interval=0; - gdk_gc_set_dashes(sheet->xor_gc, sheet->interval, "\4\4", 2); + gdk_gc_set_dashes(sheet->xor_gc, sheet->interval, dashes, sizeof(dashes)); gtk_sheet_draw_flashing_range(sheet, sheet->clip_range); - gdk_gc_set_dashes(sheet->xor_gc, 0, "\4\4", 2); + gdk_gc_set_dashes(sheet->xor_gc, 0, dashes, sizeof(dashes)); GDK_THREADS_LEAVE(); @@ -6812,7 +6813,7 @@ gdk_gc_set_clip_rectangle(sheet->xor_gc, &clip_area); - for(i=-1;i<=1;i=i++) + for (i=-1; i<=1; i++) gdk_draw_rectangle(sheet->sheet_window, sheet->xor_gc, FALSE, Index: external/gtk-1.2/gtk/gtktogglecombo.c =================================================================== RCS file: /sources/tsp/tsp/external/gtk-1.2/gtk/gtktogglecombo.c,v retrieving revision 1.1 diff -u -r1.1 gtktogglecombo.c --- external/gtk-1.2/gtk/gtktogglecombo.c 17 Nov 2007 14:31:36 -0000 1.1 +++ external/gtk-1.2/gtk/gtktogglecombo.c 17 Nov 2007 19:18:58 -0000 @@ -42,7 +42,7 @@ LAST_SIGNAL }; -static gint toggle_combo_signals[LAST_SIGNAL] = {0}; +static guint toggle_combo_signals[LAST_SIGNAL] = {0}; static void gtk_toggle_combo_class_init (GtkToggleComboClass *klass); Index: src/consumers/gdisp+/gdisp_plotEarth.c =================================================================== RCS file: /sources/tsp/tsp/src/consumers/gdisp+/gdisp_plotEarth.c,v retrieving revision 1.1 diff -u -r1.1 gdisp_plotEarth.c --- src/consumers/gdisp+/gdisp_plotEarth.c 14 Nov 2007 21:53:19 -0000 1.1 +++ src/consumers/gdisp+/gdisp_plotEarth.c 17 Nov 2007 19:18:59 -0000 @@ -307,8 +307,8 @@ /* Kernel_T *kernel = (Kernel_T*)data; */ Earth_T *plot = (Earth_T*)NULL; - guint xPosition = 0; - guint yPosition = 0; + gint xPosition = 0; + gint yPosition = 0; /* * Get private data. Index: src/consumers/gdisp+/gdisp_xml.c =================================================================== RCS file: /sources/tsp/tsp/src/consumers/gdisp+/gdisp_xml.c,v retrieving revision 1.12 diff -u -r1.12 gdisp_xml.c --- src/consumers/gdisp+/gdisp_xml.c 17 Nov 2007 14:50:42 -0000 1.12 +++ src/consumers/gdisp+/gdisp_xml.c 17 Nov 2007 19:18:59 -0000 @@ -56,6 +56,8 @@ #include "gdisp_xml.h" +#define UTF8_TO_CHAR (char*) + /* -------------------------------------------------------------------- STATIC ROUTINES @@ -344,11 +346,11 @@ char mode ) { - xmlChar spaces[3] = { ' ', ' ', '\0' }; - gint nbSpaces = xmlStrlen(spaces); + char spaces[3] = { ' ', ' ', '\0' }; + size_t nbSpaces = sizeof(spaces) - 1; if (mode == GD_INCREASE_INDENTATION) { - strcat(BAD_CAST indentBuffer,BAD_CAST spaces); + strcat(UTF8_TO_CHAR indentBuffer, spaces); } else if (mode == GD_DECREASE_INDENTATION) { if (xmlStrlen(indentBuffer) >= nbSpaces) {