Skip to content

Commit add7467

Browse files
committed
base: use intptr_t types for CFHashCode
Use `intptr_t` size types instead to ensure that the Windows correctly maps them on x64.
1 parent 0d25ad0 commit add7467

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

CoreFoundation/Base.subproj/CFBase.h

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -446,17 +446,10 @@ CF_EXPORT double kCFCoreFoundationVersionNumber;
446446
#define kCFCoreFoundationVersionNumber_iOS_9_x_Max 1299
447447
#endif
448448

449-
#if __LLP64__
450-
typedef unsigned long long CFTypeID;
451-
typedef unsigned long long CFOptionFlags;
452-
typedef unsigned long long CFHashCode;
453-
typedef signed long long CFIndex;
454-
#else
455-
typedef unsigned long CFTypeID;
456-
typedef unsigned long CFOptionFlags;
457-
typedef unsigned long CFHashCode;
458-
typedef signed long CFIndex;
459-
#endif
449+
typedef uintptr_t CFTypeID;
450+
typedef uintptr_t CFOptionFlags;
451+
typedef uintptr_t CFHashCode;
452+
typedef intptr_t CFIndex;
460453

461454
/* Base "type" of all "CF objects", and polymorphic functions on them */
462455
typedef const CF_BRIDGED_TYPE(id) void * CFTypeRef;

0 commit comments

Comments
 (0)