diff -Naur kdepim-3.0.5a/config.h.in kdepim-3.0.5a-strlcpy/config.h.in
--- kdepim-3.0.5a/config.h.in	2002-12-21 00:43:49.000000000 -0600
+++ kdepim-3.0.5a-strlcpy/config.h.in	2003-01-11 15:06:10.000000000 -0600
@@ -213,14 +213,6 @@
 
 
 
-#if !defined(HAVE_STRLCPY_PROTO)
-#ifdef __cplusplus
-extern "C"
-#endif
-unsigned int strlcpy(char*, const char*, unsigned int);
-#endif
-
-
 /* Define to `int' if <sys/types.h> doesn't define. */
 #undef gid_t
 
diff -Naur kdepim-3.0.5a/configure kdepim-3.0.5a-strlcpy/configure
--- kdepim-3.0.5a/configure	2002-12-21 00:44:21.000000000 -0600
+++ kdepim-3.0.5a-strlcpy/configure	2003-01-11 15:06:59.000000000 -0600
@@ -22120,7 +22120,7 @@
 {
 
     #if SIZEOF_SIZE_T != SIZEOF_UNSIGNED_INT
-       choke me
+       /* choke me */
     #endif
 
   ;
diff -Naur kdepim-3.0.5a/kpilot/kpilot/interactiveSync.cc kdepim-3.0.5a-strlcpy/kpilot/kpilot/interactiveSync.cc
--- kdepim-3.0.5a/kpilot/kpilot/interactiveSync.cc	2002-12-15 21:55:00.000000000 -0600
+++ kdepim-3.0.5a-strlcpy/kpilot/kpilot/interactiveSync.cc	2003-01-11 15:08:07.000000000 -0600
@@ -67,6 +67,14 @@
 
 #include "interactiveSync.moc"
 
+#ifndef HAVE_STRLCPY_PROTO
+#include <sys/types.h>
+#ifdef __cplusplus
+extern "C"
+#endif
+size_t strlcpy(char*, const char*, size_t);
+#endif
+
 
 CheckUser::CheckUser(KPilotDeviceLink * p, QWidget * vp):
 	InteractiveAction(p, vp, "userCheck")