--- ./conduits/expense/expense_conduit.c	Mon Mar 13 00:14:30 2000
+++ ../gnome-pilot-0.1.54/./conduits/expense/expense_conduit.c	Sun Apr  8 15:44:39 2001
@@ -43,7 +43,9 @@
                                         "$NZ", "NOK", "Pts", "SEK", "CHF", "GBP", "$", "EU" };
 
 /* #define EC_DEBUG */
-#ifdef EC_DEBUG
+#ifndef __GNUC__
+static void LOG(gchar *format,...);
+#elif defined(EC_DEBUG)
 #define LOG(format,args...) g_log (G_LOG_DOMAIN, \
                                    G_LOG_LEVEL_MESSAGE, \
                                    "expense: "##format, ##args)
@@ -141,7 +143,7 @@
 {
         char entry[0xffff];
     
-        const int kDateStrSize = 30;
+#define kDateStrSize    30
         char DateStr[kDateStrSize];
         char *Currency;
 
@@ -330,3 +332,17 @@
         gtk_object_destroy(GTK_OBJECT(c));
 }
 
+
+#ifndef __GNUC__
+static void LOG(gchar *mesg,...)
+{
+#ifdef EC_DEBUG
+	va_list ap;
+	gchar *format = g_strconcat("expense: ", mesg, NULL);
+	va_start(ap,mesg);
+	g_log(G_LOG_DOMAIN,G_LOG_LEVEL_MESSAGE,format,&ap);
+	va_end(ap);
+	g_free(format);
+#endif
+}
+#endif
--- ./conduits/email/email_conduit.c	Fri Aug  4 22:02:23 2000
+++ ../gnome-pilot-0.1.54/./conduits/email/email_conduit.c	Sun Apr  8 15:45:38 2001
@@ -23,7 +23,9 @@
 #define CONDUIT_VERSION "0.10"
 
 /*#define EC_DEBUG */
-#ifdef EC_DEBUG
+#ifndef __GNUC__
+static void LOG(gchar *format,...);
+#elif defined(EC_DEBUG)
 #define LOG(format,args...) g_log (G_LOG_DOMAIN, \
                                    G_LOG_LEVEL_MESSAGE, \
                                    "email: "##format, ##args)
@@ -526,3 +528,16 @@
   gtk_object_destroy(GTK_OBJECT(c));
 }
 
+#ifndef __GNUC__
+static void LOG(gchar *mesg,...)
+{
+#ifdef EC_DEBUG
+	va_list ap;
+	gchar *format = g_strconcat("email: ", mesg, NULL);
+	va_start(ap,mesg);
+	g_log(G_LOG_DOMAIN,G_LOG_LEVEL_MESSAGE,format,&ap);
+	va_end(ap);
+	g_free(format);
+#endif
+}
+#endif
--- ./conduits/memo_file/memo_file_conduit.c	Sun Aug  6 21:02:17 2000
+++ ../gnome-pilot-0.1.54/./conduits/memo_file/memo_file_conduit.c	Sun Apr  8 15:46:18 2001
@@ -44,7 +44,9 @@
 
 #define MC_DEBUG
 
-#ifdef MC_DEBUG
+#ifndef __GNUC__
+static void LOG(gchar *mesg, ...);
+#elif defined(MC_DEBUG)
 #define LOG(args...) g_log (G_LOG_DOMAIN, \
                             G_LOG_LEVEL_MESSAGE, \
                              "memo_file: "##args)
@@ -1119,3 +1121,16 @@
 }
 
 
+#ifndef __GNUC__
+static void LOG(gchar *mesg,...)
+{
+#ifdef MC_DEBUG
+	va_list ap;
+	gchar *format = g_strconcat("memo_file: ", mesg, NULL);
+	va_start(ap,mesg);
+	g_log(G_LOG_DOMAIN,G_LOG_LEVEL_MESSAGE,format,&ap);
+	va_end(ap);
+	g_free(format);
+#endif
+}
+#endif
--- ./utils/Makefile.am	Thu Jul  6 00:58:12 2000
+++ ../gnome-pilot-0.1.54/./utils/Makefile.am	Sun Apr  8 15:46:54 2001
@@ -16,6 +16,7 @@
 gpilotd_client_LDADD = \
 	$(top_builddir)/gpilotd/libgpilotd.la \
 	$(ORBIT_LIBS) \
+	$(INTLLIBS) \
 	$(GNORBA_LIBS)	\
 	$(BONOBO_VFS_GNOME_LIBS) \
 	$(PISOCK_LIBDIR) $(PISOCK_LIBS)
@@ -24,6 +25,7 @@
 gpilotdcm_client_LDADD = \
 	$(top_builddir)/libgpilotdCM/libgpilotdcm.la \
 	$(ORBIT_LIBS) \
+	$(INTLLIBS) \
 	$(GNORBA_LIBS) \
 	$(BONOBO_VFS_GNOME_LIBS) \
 	$(top_builddir)/gpilotd/libgpilotdconduit.la \
--- ./utils/Makefile.in	Mon Aug  7 01:22:04 2000
+++ ../gnome-pilot-0.1.54/./utils/Makefile.in	Sun Apr  8 15:47:33 2001
@@ -164,11 +164,11 @@
 
 
 gpilotd_client_SOURCES = gpilotd-client.c
-gpilotd_client_LDADD =  	$(top_builddir)/gpilotd/libgpilotd.la 	$(ORBIT_LIBS) 	$(GNORBA_LIBS)		$(BONOBO_VFS_GNOME_LIBS) 	$(PISOCK_LIBDIR) $(PISOCK_LIBS)
+gpilotd_client_LDADD =  	$(top_builddir)/gpilotd/libgpilotd.la 	$(ORBIT_LIBS) 	$(INTLLIBS) $(GNORBA_LIBS)		$(BONOBO_VFS_GNOME_LIBS) 	$(PISOCK_LIBDIR) $(PISOCK_LIBS)
 
 
 gpilotdcm_client_SOURCES = gpilotdcm-client.c
-gpilotdcm_client_LDADD =  	$(top_builddir)/libgpilotdCM/libgpilotdcm.la 	$(ORBIT_LIBS) 	$(GNORBA_LIBS) 	$(BONOBO_VFS_GNOME_LIBS) 	$(top_builddir)/gpilotd/libgpilotdconduit.la 	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 	$(GNOME_XML_LIB)
+gpilotdcm_client_LDADD =  	$(top_builddir)/libgpilotdCM/libgpilotdcm.la 	$(ORBIT_LIBS) 	$(INTLLIBS) $(GNORBA_LIBS) 	$(BONOBO_VFS_GNOME_LIBS) 	$(top_builddir)/gpilotd/libgpilotdconduit.la 	$(PISOCK_LIBDIR) $(PISOCK_LIBS) 	$(GNOME_XML_LIB)
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
--- ./gpilotd/queue_io.h	Sun Aug  6 21:02:18 2000
+++ ../gnome-pilot-0.1.54/./gpilotd/queue_io.h	Sun Apr  8 15:48:04 2001
@@ -83,8 +83,10 @@
 			guint32 pilot_id;
 		} set_userinfo;
 		struct {
+			gboolean unused; /* empty structs are illegal */
 		} get_userinfo;
 		struct {
+			gboolean unused; /* empty structs are illegal */
 		} get_sysinfo;
 	} parameters;
 	
--- ./gpilotd/manager.c	Sun Aug  6 21:02:18 2000
+++ ../gnome-pilot-0.1.54/./gpilotd/manager.c	Sun Apr  8 15:50:21 2001
@@ -476,6 +476,10 @@
 							    req->parameters.restore.directory);
 		break;
 	default:
+#ifndef __GNUC__
+#undef __PRETTY_FUNCTION__
+#define __PRETTY_FUNCTION__	"install_db_foreach()"
+#endif
 		g_warning (_("%s this request.type == %d is not a install/restore"), __PRETTY_FUNCTION__, req->type);
 		break;
 	}
--- ./gpilotd/orbit_daemon_glue.c	Sun Aug  6 21:02:18 2000
+++ ../gnome-pilot-0.1.54/./gpilotd/orbit_daemon_glue.c	Sun Apr  8 15:51:06 2001
@@ -1529,6 +1529,10 @@
 	g_return_if_fail(*req!=NULL);
 
 	/* If there is no client to notify, just purge request and return */
+#ifndef __GNUC__
+#undef __PRETTY_FUNCTION__
+#define __PRETTY_FUNCTION__	"orbed_notify_completion()"
+#endif
 	if((*req)->client_id==NULL) {
 		LOG("%s: no client_id in request",__PRETTY_FUNCTION__);
 		gpc_queue_purge_request(req);
@@ -2000,3 +2004,17 @@
    disconnects)
 
 */
+
+#ifndef __GNUC__
+void LOG(gchar *mesg,...)
+{
+#ifdef GPC_DEBUG
+	va_list ap;
+	gchar *format = g_strconcat("gpilotd: ", mesg, NULL);
+	va_start(ap,mesg);
+	g_log(G_LOG_DOMAIN,G_LOG_LEVEL_MESSAGE,format,&ap);
+	va_end(ap);
+	g_free(format);
+#endif
+}
+#endif
--- ./gpilotd/orbit_daemon_glue.h	Sun Aug  6 21:02:18 2000
+++ ../gnome-pilot-0.1.54/./gpilotd/orbit_daemon_glue.h	Sun Apr  8 15:51:31 2001
@@ -32,7 +32,9 @@
 #define GPC_DEBUG
 
 /* the LOG macro cannot by used without a format */
-#ifdef GPC_DEBUG
+#if !defined(__GNUC__)
+void LOG(gchar *format,...);
+#elif defined(GPC_DEBUG)
 #define LOG(format,args...) g_log (G_LOG_DOMAIN, \
                                    G_LOG_LEVEL_MESSAGE, \
                                    "gpilotd: "##format, ##args)
--- ./gpilotd/Makefile.am	Thu Jul  6 00:58:11 2000
+++ ../gnome-pilot-0.1.54/./gpilotd/Makefile.am	Sun Apr  8 15:40:08 2001
@@ -115,9 +115,7 @@
 	gpilot-structures.h \
 	gpilot-userinfo.h
 
-CFLAGS = -Wall -Wmissing-prototypes\
-	 -Wmissing-declarations\
-	 -Wpointer-arith -g \
+CFLAGS = -g \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 
 
 
--- ./gpilotd/Makefile.in	Mon Aug  7 01:21:32 2000
+++ ../gnome-pilot-0.1.54/./gpilotd/Makefile.in	Sun Apr  8 15:40:21 2001
@@ -224,7 +224,7 @@
 gpilotinclude_HEADERS =  	gnome-pilot-conduit.h 	gnome-pilot.h 	gpilotd-app.h 	gpilotd-app-dummy-callbacks.h 	gpilotd-conduit-mgmt.h 	gpilot-structures.h 	gpilot-userinfo.h
 
 
-CFLAGS = -Wall -Wmissing-prototypes 	 -Wmissing-declarations 	 -Wpointer-arith -g 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 
+CFLAGS = -g 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 
 
 
 gpilotd_SOURCES =  	$(CORBA_SRCLIST) 	gpilotd.c		manager.c		manager.h		queue_io.c 			queue_io.h		$(GPILOTD_ORB_SRCLIST) 		gpilot-structures.c		gpilot-userinfo.c 	gpilot-gui.h 	gpilot-gui.c
--- ./gpilotd/gpilot-gui.h	Sun Aug  6 21:02:18 2000
+++ ../gnome-pilot-0.1.54/./gpilotd/gpilot-gui.h	Sun Apr  8 15:52:11 2001
@@ -27,8 +27,12 @@
 
 void gpilot_gui_run_dialog(gchar* type,gchar*,...);
 
+#ifdef __GNUC__
 #define gpilot_gui_warning_dialog(format,args...) gpilot_gui_run_dialog(GNOME_MESSAGE_BOX_WARNING,format,##args)
-
 #define gpilot_gui_error_dialog(format,args...) gpilot_gui_run_dialog(GNOME_MESSAGE_BOX_ERROR,format,##args)
+#else
+void gpilot_gui_warning_dialog(gchar *format,...);
+void gpilot_gui_error_dialog(gchar *format,...);
+#endif
 
 #endif /* _GPILOT_GUI_H_ */
--- ./gpilotd/gpilot-gui.c	Sun Aug  6 21:02:18 2000
+++ ../gnome-pilot-0.1.54/./gpilotd/gpilot-gui.c	Sun Apr  8 15:53:02 2001
@@ -49,10 +49,13 @@
 	va_end(ap);
 }
 
-/*
+#ifndef __GNUC__
 void 
 gpilot_gui_error_dialog(gchar *mesg,...) {
+	va_list ap;
+	va_start(ap,mesg);
 	gpilot_gui_run_dialog(GNOME_MESSAGE_BOX_ERROR,mesg,&ap);
+	va_end(ap);
 }
 
 void 
@@ -62,4 +65,4 @@
 	gpilot_gui_run_dialog(GNOME_MESSAGE_BOX_WARNING,mesg,&ap);
 	va_end(ap);
 }
-*/
+#endif
--- ./gpilotd/gpilotd.c	Sun Aug  6 21:02:18 2000
+++ ../gnome-pilot-0.1.54/./gpilotd/gpilotd.c	Sun Apr  8 15:54:49 2001
@@ -403,7 +403,7 @@
 static gboolean 
 sync_device (GPilotDevice *device, GPilotContext *context)
 {
-	GPilotPilot *pilot;
+	GPilotPilot *pilot = NULL;
 	int pfd;
 	int connect_error;
 	struct PilotUser pu;
--- ./gpilotd/gnome-pilot-conduit-standard-abs.c	Sun Aug  6 21:02:17 2000
+++ ../gnome-pilot-0.1.54/./gpilotd/gnome-pilot-conduit-standard-abs.c	Sun Apr  8 15:55:48 2001
@@ -824,7 +824,7 @@
 	gtk_signal_emit (GTK_OBJECT (conduit),
 			 pilot_conduit_standard_abs_signals [SET_ARCHIVED],
 			 local,
-			 archived
+			 archived,
 			 &retval);
 	return retval;
 }