From 9f74010f9947ba92a347c26b9b9f7d746a72478b Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Tue, 20 Mar 2012 13:42:40 +0000 Subject: [PATCH] Monotone-Parent: 618681307a4cbc2f326ac0bdd3eb6077cb9a22f4 Monotone-Revision: 4adb09f9c02af62ea07b317c5c6a14100b8204e1 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2012-03-20T13:42:40 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ OpenChange/MAPIStoreTypes.h | 2 +- OpenChange/MAPIStoreTypes.m | 3 ++- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c51b99e2d..8f9d93bb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-03-20 Wolfgang Sourdeau + + * OpenChange/MAPIStoreTypes.m (MAPIChangeKeyGUIDCompare): NSData + arguments passed as "id" due to the pickiness of some versions of + gcc. + 2012-03-19 Wolfgang Sourdeau * Main/SOGo+DAV.m (_fillCollections:where:matches:inContext:): diff --git a/OpenChange/MAPIStoreTypes.h b/OpenChange/MAPIStoreTypes.h index 1fec6a6a7..286c0b298 100644 --- a/OpenChange/MAPIStoreTypes.h +++ b/OpenChange/MAPIStoreTypes.h @@ -43,7 +43,7 @@ id NSObjectFromMAPISPropValue (const struct mapi_SPropValue *); id NSObjectFromValuePointer (enum MAPITAGS, const void *); NSComparisonResult MAPICNCompare (uint64_t cn1, uint64_t cn2, void *); -NSComparisonResult MAPIChangeKeyGUIDCompare (NSData *ck1, NSData *ck2, void *); +NSComparisonResult MAPIChangeKeyGUIDCompare (id ck1, id ck2, void *); static inline NSNumber * MAPIPropertyKey (enum MAPITAGS propTag) diff --git a/OpenChange/MAPIStoreTypes.m b/OpenChange/MAPIStoreTypes.m index c294dd429..bcef90ae1 100644 --- a/OpenChange/MAPIStoreTypes.m +++ b/OpenChange/MAPIStoreTypes.m @@ -298,7 +298,8 @@ MAPICNCompare (uint64_t cn1, uint64_t cn2, void *unused) return result; } -NSComparisonResult MAPIChangeKeyGUIDCompare (NSData *ck1, NSData *ck2, void *unused) +NSComparisonResult +MAPIChangeKeyGUIDCompare (id ck1, id ck2, void *unused) { NSUInteger count; const unsigned char *ptr1, *ptr2;