diff -ur kdepim-3.5.6/kpilot/lib/pilotAppInfo.h kdepim-3.5.6-r1/kpilot/lib/pilotAppInfo.h
--- kdepim-3.5.6/kpilot/lib/pilotAppInfo.h	2007-01-15 06:29:07.000000000 -0500
+++ kdepim-3.5.6-r1/kpilot/lib/pilotAppInfo.h	2007-02-12 09:43:46.877512069 -0500
@@ -136,8 +136,8 @@
 * (again, from pilot-link).
 */
 template <typename appinfo,
-	int(*unpack)(appinfo *, unsigned char *, PI_SIZE_T),
-	int(*pack)(appinfo *, unsigned char *, PI_SIZE_T)>
+	int(*unpack)(appinfo *, const unsigned char *, PI_SIZE_T),
+	int(*pack)(const appinfo *, unsigned char *, PI_SIZE_T)>
 class PilotAppInfo : public PilotAppInfoBase
 {
 public:
diff -ur kdepim-3.5.6/kpilot/lib/pilotMemo.h kdepim-3.5.6-r1/kpilot/lib/pilotMemo.h
--- kdepim-3.5.6/kpilot/lib/pilotMemo.h	2007-01-15 06:29:07.000000000 -0500
+++ kdepim-3.5.6-r1/kpilot/lib/pilotMemo.h	2007-02-12 09:41:53.684719989 -0500
@@ -98,6 +98,6 @@
 	QString fText;
 };
 
-typedef PilotAppInfo<MemoAppInfo,unpack_MemoAppInfo, pack_MemoAppInfo> PilotMemoInfo;
+typedef PilotAppInfo<struct MemoAppInfo,unpack_MemoAppInfo, pack_MemoAppInfo> PilotMemoInfo;
 
 #endif