--- ./src/libguppidataimpl/guppi-category-core.c	Tue Jan  8 01:28:59 2002
+++ ../Guppi-0.40.3/./src/libguppidataimpl/guppi-category-core.c	Fri Dec  6 13:42:52 2002
@@ -205,7 +205,9 @@
 v_foreach (GuppiCategory *cat, GuppiCategoryFn fn, gpointer user_data)
 {
   GuppiCategoryCore *core = GUPPI_CATEGORY_CORE (cat);
-  struct category_foreach foo = { fn, user_data };
+  struct category_foreach foo = { /* fn, user_data */ NULL };
+  foo.fn = fn;
+  foo.user_data = user_data;
 
   g_hash_table_foreach (core->name2code, foreach_handler, &foo);
 }
--- ./src/libguppiuseful/guppi-memory.h	Sat Nov 17 23:40:22 2001
+++ ../Guppi-0.40.3/./src/libguppiuseful/guppi-memory.h	Fri Dec  6 13:07:50 2002
@@ -60,8 +60,13 @@
 #define guppi_strdup(s) (_guppi_strdup((s),__FILE__,__LINE__))
 #define guppi_strndup(s,N) (_guppi_strndup((s),(N),__FILE__,__LINE__))
 
+#ifdef __sgi
+/* Only the MIPSpro 7.4 compilers support variadic macros */
+#define	guppi_strdup_printf g_strdup_printf
+#else
 #define guppi_strdup_printf(format, args...) \
 (_guppi_strdup_printf(__FILE__,__LINE__,(format),##args))
+#endif
 
 #define guppi_strdup_vprintf(format,args) (_guppi_strdup_vprintf(__FILE__,__LINE__,(format),(args)))
 
--- ./src/libguppiuseful/guppi-xml.c	Fri Sep 28 02:38:51 2001
+++ ../Guppi-0.40.3/./src/libguppiuseful/guppi-xml.c	Fri Dec  6 13:21:45 2002
@@ -143,7 +143,7 @@
 void
 guppi_xml_document_cache (GuppiXMLDocument *doc, guppi_uniq_t uid, gpointer ptr)
 {
-  return guppi_xml_document_cache_full (doc, uid, ptr, NULL);
+  guppi_xml_document_cache_full (doc, uid, ptr, NULL);
 }
 
 void
--- ./src/libguppiuseful/guppi-plug-in.c	Sat Sep  8 01:49:59 2001
+++ ../Guppi-0.40.3/./src/libguppiuseful/guppi-plug-in.c	Fri Dec  6 13:20:10 2002
@@ -47,7 +47,7 @@
 
   guppi_finalized (obj);
 
-  guppi_free0 ((gpointer)pi->load_path);
+  guppi_free0 (pi->load_path);
 
   if (parent_class->finalize)
     parent_class->finalize (obj);
--- ./src/libguppiuseful/guppi-config-model.c	Mon Nov 26 15:00:18 2001
+++ ../Guppi-0.40.3/./src/libguppiuseful/guppi-config-model.c	Fri Dec  6 13:16:03 2002
@@ -37,7 +37,7 @@
   LAST_SIGNAL
 };
 
-static guint guppi_config_model_signals[LAST_SIGNAL] = { 0 };
+static guint guppi_config_model_signals[LAST_SIGNAL + 1] = { 0 };
 
 struct _GuppiConfigModelPrivate {
   GList *items;
--- ./src/libguppiplot/guppi-canvas-group.c	Mon Nov 26 15:00:17 2001
+++ ../Guppi-0.40.3/./src/libguppiplot/guppi-canvas-group.c	Fri Dec  6 13:49:25 2002
@@ -35,6 +35,7 @@
 
 typedef struct _GuppiCanvasGroupPrivate GuppiCanvasGroupPrivate;
 struct _GuppiCanvasGroupPrivate {
+  int dummy;			/* empty records are not allowed */
 };
 
 #define priv(x) ((GuppiCanvasGroupPrivate*)((GUPPI_CANVAS_GROUP(x))->opaque_internals))
@@ -254,7 +255,9 @@
 		       void (*fn) (GuppiPlotToolkit *, gpointer),
 		       gpointer user_data)
 {
-  struct foreach_toolkit foo = { fn, user_data };
+  struct foreach_toolkit foo = { /* fn, user_data */ NULL };
+  foo.fn = fn;
+  foo.user_data = user_data;
 
   guppi_canvas_group_foreach_item (GUPPI_CANVAS_GROUP (item),
 				   foreach_toolkit_fn, &foo);
--- ./src/libguppiplot/guppi-canvas-item.c	Fri Nov 16 11:58:56 2001
+++ ../Guppi-0.40.3/./src/libguppiplot/guppi-canvas-item.c	Fri Dec  6 13:52:01 2002
@@ -1279,7 +1279,11 @@
 			      GuppiCanvasItemFunc fn, gpointer user_data)
 {
   GuppiGeometry *geom;
-  struct foreach_at foo = { pt_x, pt_y, fn, user_data };
+  struct foreach_at foo = { /* pt_x, pt_y, fn, user_data */ 0 };
+  foo.pt_x = pt_x;
+  foo.pt_y = pt_y;
+  foo.fn = fn;
+  foo.user_data = user_data;
 
   g_return_if_fail (item != NULL && GUPPI_IS_CANVAS_ITEM (item));
   g_return_if_fail (fn != NULL);
@@ -1328,7 +1332,9 @@
 				     GuppiCanvasItemTest fn,
 				     gpointer user_data)
 {
-  struct first_matching foo = { fn, user_data, NULL };
+  struct first_matching foo = { /* fn, user_data, NULL */ NULL };
+  foo.fn = fn;
+  foo.user_data = user_data;
 
   guppi_canvas_item_foreach_at (item, pt_x, pt_y, find_first_match, &foo);
   return foo.match;
--- ./guppi-gnumeric/guppi-gnumeric-bonobo-view.c	Tue Oct 16 20:45:12 2001
+++ ../Guppi-0.40.3/./guppi-gnumeric/guppi-gnumeric-bonobo-view.c	Fri Dec  6 14:26:40 2002
@@ -44,7 +44,7 @@
 #define GUP_GNM_BONOBO_VIEW_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), GUP_GNM_BONOBO_VIEW_TYPE, GupGnmBonoboViewClass))
 #define IS_GUP_GNM_BONOBO_VIEW(o)       (GTK_CHECK_TYPE ((o), GUP_GNM_BONOBO_VIEW_TYPE))
 #define IS_GUP_GNM_BONOBO_VIEW_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), GUP_GNM_BONOBO_VIEW_TYPE))
-#define SERVANT_TO_GUP_GNM_BONOBO_VIEW(ptr) (GupGnmBonoboView *)(((void *)ptr) - GTK_STRUCT_OFFSET(GupGnmBonoboView, servant))
+#define SERVANT_TO_GUP_GNM_BONOBO_VIEW(ptr) (GupGnmBonoboView *)(((char *)ptr) - GTK_STRUCT_OFFSET(GupGnmBonoboView, servant))
 
 static BonoboViewClass *gup_gnm_bonobo_view_parent_class = NULL;
 
--- ./guppi-gnumeric/guppi-gnumeric-vector.c	Mon Jan 21 19:41:16 2002
+++ ../Guppi-0.40.3/./guppi-gnumeric/guppi-gnumeric-vector.c	Fri Dec  6 14:26:39 2002
@@ -70,7 +70,7 @@
 
 #define GUP_GNM_VECTOR_CLASS(k)		(GTK_CHECK_CLASS_CAST((k), GUP_GNM_VECTOR_TYPE, GupGnmVectorClass))
 #define IS_GUP_GNM_VECTOR_CLASS(k)	(GTK_CHECK_CLASS_TYPE ((k), GUP_GNM_VECTOR_TYPE))
-#define SERVANT_TO_GUP_GNM_VECTOR(ptr)	(GupGnmVector *)(((void *)ptr) - GTK_STRUCT_OFFSET(GupGnmVector, servant))
+#define SERVANT_TO_GUP_GNM_VECTOR(ptr)	(GupGnmVector *)(((char *)ptr) - GTK_STRUCT_OFFSET(GupGnmVector, servant))
 
 static GtkObjectClass *gup_gnm_vector_parent_class = NULL;
 static POA_GNOME_Gnumeric_VectorSelection__vepv	vector_selection_vepv;
--- ./plug-ins/plot/scatter/guppi-scatter-state.c	Sun Jan 20 21:35:16 2002
+++ ../Guppi-0.40.3/./plug-ins/plot/scatter/guppi-scatter-state.c	Fri Dec  6 14:10:07 2002
@@ -161,7 +161,7 @@
 guppi_scatter_state_get_x_axis_type (GuppiScatterState *ss)
 {
   int type;
-  g_return_val_if_fail (GUPPI_IS_SCATTER_STATE (ss), NULL);
+  g_return_val_if_fail (GUPPI_IS_SCATTER_STATE (ss), 0);
 
   guppi_element_state_get (GUPPI_ELEMENT_STATE (ss), "x_axis_type", &type, NULL);
   return type;
@@ -171,7 +171,7 @@
 guppi_scatter_state_get_y_axis_type (GuppiScatterState *ss)
 {
   int type;
-  g_return_val_if_fail (GUPPI_IS_SCATTER_STATE (ss), NULL);
+  g_return_val_if_fail (GUPPI_IS_SCATTER_STATE (ss), 0);
 
   guppi_element_state_get (GUPPI_ELEMENT_STATE (ss), "y_axis_type", &type, NULL);
   return type;
--- ./ltmain.sh	Mon Jan 21 23:15:19 2002
+++ ../Guppi-0.40.3/./ltmain.sh	Fri Dec  6 12:21:13 2002
@@ -61,7 +61,7 @@
 default_mode=
 help="Try \`$progname --help' for more information."
 magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
+mkdir="mkdir -p"
 mv="mv -f"
 rm="rm -f"