--- ./configure Mon Nov 25 04:38:23 2002 +++ ../sodipodi-0.28/./configure Mon Dec 9 23:54:12 2002 @@ -1410,7 +1410,7 @@ fi -CFLAGS="$CFLAGS -Wall -Wunused" +CFLAGS="$CFLAGS" ALL_LINGUAS="az ca da de el es et fr ga gl hu it ja no ru sk sl sv tr uk pl pt_BR pt zh_CN" --- ./intltool-merge.in Mon Nov 25 04:38:18 2002 +++ ../sodipodi-0.28/./intltool-merge.in Wed Jan 1 00:39:41 2003 @@ -232,7 +232,8 @@ if ($UTF8_ARG) { my $encoding = get_po_encoding($po_file); - open PO_FILE, "iconv -f $encoding -t UTF-8 $po_file|"; + my $iconv = $ENV{"INTLTOOL_ICONV"} || "iconv"; + open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|"; } else { open PO_FILE, "<$po_file"; } --- ./src/sp-object.c Mon Oct 7 12:24:53 2002 +++ ../sodipodi-0.28/./src/sp-object.c Tue Dec 10 00:20:17 2002 @@ -12,8 +12,14 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include #include #include + +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #include "xml/repr-private.h" #include "document.h" --- ./src/sp-object-group.c Sat Oct 5 09:53:18 2002 +++ ../sodipodi-0.28/./src/sp-object-group.c Tue Dec 10 01:14:00 2002 @@ -91,7 +91,15 @@ type = sp_repr_type_lookup (rchild); if (gtk_type_is_a (type, SP_TYPE_OBJECT)) { child = gtk_type_new (type); +#ifdef __GNUC__ (last) ? last->next : og->children = sp_object_attach_reref (object, child, NULL); +#else + if (last) { + last->next = sp_object_attach_reref(object, child, NULL); + } else { + og->children = sp_object_attach_reref(object, child, NULL); + } +#endif sp_object_invoke_build (child, document, rchild, SP_OBJECT_IS_CLONED (object)); last = child; } @@ -158,7 +166,15 @@ } if (oc) { +#ifdef __GNUC__ (ref) ? ref->next : og->children = sp_object_detach_unref (object, oc); +#else + if (ref) { + ref->next = sp_object_detach_unref(object, oc); + } else { + og->children = sp_object_detach_unref(object, oc); + } +#endif sp_object_request_modified (object, SP_OBJECT_MODIFIED_FLAG); } } @@ -179,8 +195,26 @@ onew = sp_objectgroup_get_le_child_by_repr (og, new); if (ochild) { +#ifdef __GNUC__ (oold) ? oold->next : og->children = sp_object_detach (object, ochild); +#else + if (oold) { + oold->next = sp_object_detach(object, ochild); + } else { + og->children = sp_object_detach(object, ochild); + } +#endif +#ifdef __GNUC__ (onew) ? onew->next : og->children = sp_object_attach_reref (object, ochild, (onew) ? onew->next : og->children); +#else + if (onew) { + onew->next = sp_object_attach_reref(object, ochild, (onew) ? + onew->next : og->children); + } else { + og->children = sp_object_attach_reref(object, ochild, (onew) ? + onew->next : og->children); + } +#endif sp_object_request_modified (object, SP_OBJECT_MODIFIED_FLAG); } } --- ./src/sp-defs.c Sat Oct 5 09:37:09 2002 +++ ../sodipodi-0.28/./src/sp-defs.c Tue Dec 10 01:14:23 2002 @@ -96,7 +96,15 @@ SPObject * child; type = sp_repr_type_lookup (rchild); child = gtk_type_new (type); +#ifdef __GNUC__ last ? last->next : defs->children = sp_object_attach_reref (object, child, NULL); +#else + if (last) { + last->next = sp_object_attach_reref(object, child, NULL); + } else { + defs->children = sp_object_attach_reref(object, child, NULL); + } +#endif sp_object_invoke_build (child, document, rchild, SP_OBJECT_IS_CLONED (object)); last = child; } --- ./src/sp-item-group.c Fri Oct 25 14:39:00 2002 +++ ../sodipodi-0.28/./src/sp-item-group.c Tue Dec 10 01:14:47 2002 @@ -129,7 +129,15 @@ SPObject * child; type = sp_repr_type_lookup (rchild); child = gtk_type_new (type); +#ifdef __GNUC__ last ? last->next : group->children = sp_object_attach_reref (object, child, NULL); +#else + if (last) { + last->next = sp_object_attach_reref(object, child, NULL); + } else { + group->children = sp_object_attach_reref(object, child, NULL); + } +#endif sp_object_invoke_build (child, document, rchild, SP_OBJECT_IS_CLONED (object)); last = child; } --- ./src/sp-text.c Tue Nov 19 12:45:01 2002 +++ ../sodipodi-0.28/./src/sp-text.c Tue Dec 10 01:15:45 2002 @@ -908,7 +908,17 @@ if (rch->type == SP_XML_TEXT_NODE) { SPString *string; string = gtk_type_new (SP_TYPE_STRING); +#ifdef __GNUC__ (ref) ? ref->next : text->children = sp_object_attach_reref (object, SP_OBJECT (string), NULL); +#else + if (ref) { + ref->next = sp_object_attach_reref(object, + SP_OBJECT(string), NULL); + } else { + text->children = sp_object_attach_reref(object, + SP_OBJECT(string), NULL); + } +#endif string->ly = &text->ly; sp_object_invoke_build (SP_OBJECT (string), doc, rch, SP_OBJECT_IS_CLONED (object)); ref = SP_OBJECT (string); @@ -915,7 +925,15 @@ } else if ((rch->type == SP_XML_ELEMENT_NODE) && !strcmp (sp_repr_name (rch), "tspan")) { SPObject *child; child = gtk_type_new (SP_TYPE_TSPAN); +#ifdef __GNUC__ ref ? ref->next : text->children = sp_object_attach_reref (object, child, NULL); +#else + if (ref) { + ref->next = sp_object_attach_reref(object, child, NULL); + } else { + text->children = sp_object_attach_reref(object, child, NULL); + } +#endif sp_object_invoke_build (child, doc, rch, SP_OBJECT_IS_CLONED (object)); ref = child; } else { --- ./src/sp-gradient.c Thu Nov 14 05:56:57 2002 +++ ../sodipodi-0.28/./src/sp-gradient.c Tue Dec 10 01:16:07 2002 @@ -12,10 +12,15 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include #include #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #include @@ -272,7 +277,15 @@ type = sp_repr_type_lookup (rchild); if (gtk_type_is_a (type, SP_TYPE_OBJECT)) { child = gtk_type_new (type); +#ifdef __GNUC__ (last) ? last->next : gradient->stops = sp_object_attach_reref (object, child, NULL); +#else + if (last) { + last->next = sp_object_attach_reref(object, child, NULL); + } else { + gradient->stops = sp_object_attach_reref(object, child, NULL); + } +#endif sp_object_invoke_build (child, document, rchild, SP_OBJECT_IS_CLONED (object)); /* Set has_stops flag */ if (SP_IS_STOP (child)) gradient->has_stops = TRUE; --- ./src/sp-pattern.c Sun Oct 6 06:06:57 2002 +++ ../sodipodi-0.28/./src/sp-pattern.c Tue Dec 10 01:16:26 2002 @@ -135,7 +135,15 @@ SPObject * child; type = sp_repr_type_lookup (rchild); child = gtk_type_new (type); +#ifdef __GNUC__ last ? last->next : pat->children = sp_object_attach_reref (object, child, NULL); +#else + if (last) { + last->next = sp_object_attach_reref(object, child, NULL); + } else { + pat->children = sp_object_attach_reref(object, child, NULL); + } +#endif sp_object_invoke_build (child, document, rchild, SP_OBJECT_IS_CLONED (object)); last = child; } --- ./src/uri-references.c Tue Oct 8 00:09:28 2002 +++ ../sodipodi-0.28/./src/uri-references.c Tue Dec 10 00:29:29 2002 @@ -12,9 +12,15 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include #include #include #include + +#ifdef HAVE_ALLOCA_H +#include +#endif + #include "document.h" #include "uri-references.h" --- ./src/selection.c Fri Oct 25 14:39:00 2002 +++ ../sodipodi-0.28/./src/selection.c Tue Dec 10 00:31:34 2002 @@ -12,7 +12,11 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#if !defined(__sgi) #define sp_debug(str, section) if (FALSE) printf ("%s:%d (%s) %s\n", __FILE__, __LINE__, __FUNCTION__, str); +#else +#define sp_debug(str, section) if (FALSE) printf ("%s:%d (%s) %s\n", __FILE__, __LINE__, "unknown function", str); +#endif #include #include --- ./src/gradient-chemistry.c Tue Oct 8 11:25:01 2002 +++ ../sodipodi-0.28/./src/gradient-chemistry.c Tue Dec 10 00:32:08 2002 @@ -12,8 +12,13 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ +#include #include #include + +#ifdef HAVE_ALLOCA_H +#include +#endif #include "xml/repr-private.h" #include "style.h" --- ./src/libnrtype/nr-typeface.c Sun Nov 10 14:23:24 2002 +++ ../sodipodi-0.28/./src/libnrtype/nr-typeface.c Mon Dec 9 23:59:28 2002 @@ -65,7 +65,8 @@ void nr_typeface_glyph_outline_unref (NRTypeFace *tf, unsigned int glyph, unsigned int metrics) { - return tf->vmv->glyph_outline_unref (tf, glyph, metrics); + tf->vmv->glyph_outline_unref (tf, glyph, metrics); + return; } NRPointF * --- ./src/xml/repr.c Sun Nov 3 06:30:41 2002 +++ ../sodipodi-0.28/./src/xml/repr.c Tue Dec 10 01:17:40 2002 @@ -245,7 +245,15 @@ } if (allowed) { +#ifdef __GNUC__ (prev) ? prev->next : repr->attributes = attr->next; +#else + if (prev) { + prev->next = attr->next; + } else { + repr->attributes = attr->next; + } +#endif for (rl = repr->listeners; rl != NULL; rl = rl->next) { if (rl->vector->attr_changed) (* rl->vector->attr_changed) (repr, key, oldval, NULL, rl->data); @@ -291,7 +299,15 @@ } else { attr = sp_attribute_new_from_quark (q, value); +#ifdef __GNUC__ (prev) ? prev->next : repr->attributes = attr; +#else + if (prev) { + prev->next = attr; + } else { + repr->attributes = attr; + } +#endif } for (rl = repr->listeners; rl != NULL; rl = rl->next) { @@ -406,7 +422,15 @@ } if (allowed) { +#ifdef __GNUC__ (ref) ? ref->next : repr->children = child->next; +#else + if (ref) { + ref->next = child->next; + } else { + repr->children = child->next; + } +#endif child->parent = NULL; child->next = NULL; --- ./src/widgets/paint-selector.c Mon Nov 11 14:23:38 2002 +++ ../sodipodi-0.28/./src/widgets/paint-selector.c Tue Dec 10 00:15:16 2002 @@ -443,7 +443,9 @@ csel = gtk_object_get_data (GTK_OBJECT (psel->selector), "color-selector"); - return sp_color_selector_get_rgba_floatv (csel, rgba); + sp_color_selector_get_rgba_floatv (csel, rgba); + + return; } void @@ -455,7 +457,9 @@ csel = gtk_object_get_data (GTK_OBJECT (psel->selector), "color-selector"); - return sp_color_selector_get_cmyka_floatv (csel, cmyka); + sp_color_selector_get_cmyka_floatv (csel, cmyka); + + return; } SPGradient * @@ -482,9 +486,11 @@ gsel = gtk_object_get_data (GTK_OBJECT (psel->selector), "gradient-selector"); if (psel->mode == SP_PAINT_SELECTOR_MODE_GRADIENT_LINEAR) { - return sp_gradient_selector_get_lgradient_position_floatv (gsel, pos); + sp_gradient_selector_get_lgradient_position_floatv (gsel, pos); + return; } else { - return sp_gradient_selector_get_rgradient_position_floatv (gsel, pos); + sp_gradient_selector_get_rgradient_position_floatv (gsel, pos); + return; } } --- ./src/widgets/gradient-vector.c Wed Oct 16 12:10:41 2002 +++ ../sodipodi-0.28/./src/widgets/gradient-vector.c Tue Dec 10 00:16:42 2002 @@ -13,6 +13,11 @@ */ #include + +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #include #include --- ./src/helper/sodipodi-ctrl.c Sun Nov 17 14:50:24 2002 +++ ../sodipodi-0.28/./src/helper/sodipodi-ctrl.c Tue Dec 10 00:18:10 2002 @@ -384,7 +384,7 @@ for (y = 0; y < side; y++){ unsigned char *s, *d; s = px + y * rs; - d = ctrl->cache + 4 * side * y; + d = (char *) ctrl->cache + 4 * side * y; for (x = 0; x < side; x++) { if (s[3] < 0x80) { d[0] = 0x00; @@ -463,7 +463,7 @@ x1 = MIN (ctrl->box.x1, buf->rect.x1 - 1); for (y = y0; y <= y1; y++) { p = buf->buf + (y - buf->rect.y0) * buf->buf_rowstride + (x0 - buf->rect.x0) * 3; - q = ctrl->cache + ((y - ctrl->box.y0) * (ctrl->span*2+1) + (x0 - ctrl->box.x0)) * 4; + q = (char *) ctrl->cache + ((y - ctrl->box.y0) * (ctrl->span*2+1) + (x0 - ctrl->box.x0)) * 4; for (x = x0; x <= x1; x++) { a = *(q + 3); switch (ctrl->mode) { --- ./src/helper/bezier-utils.c Fri Nov 22 08:00:41 2002 +++ ../sodipodi-0.28/./src/helper/bezier-utils.c Tue Dec 10 00:18:53 2002 @@ -22,8 +22,12 @@ #define SP_HUGE 1e5 #define noBEZIER_DEBUG +#include #include #include +#ifdef HAVE_ALLOCA_H +#include +#endif #include "bezier-utils.h" typedef ArtPoint * BezierCurve; --- ./src/dialogs/object-attributes.c Wed Oct 16 12:10:34 2002 +++ ../sodipodi-0.28/./src/dialogs/object-attributes.c Tue Dec 10 00:19:31 2002 @@ -14,6 +14,11 @@ #include #include #include + +#ifdef HAVE_ALLOCA_H +#include +#endif + #include #include #include