ObjFW  Check-in [3204ceeca0]

Overview
Comment:Don't use objc_initializeClassPair on OS X/PPC64

OS X/PPC64 is limited to 10.5 and thus it does not exist there, even
though __OBJC2__ is defined.

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 3204ceeca06dd696204a3d9034676731cf387bb358ec4c622f767c53fe9e18f1
User & Date: js on 2014-02-21 17:19:40
Other Links: manifest | tags
Context
2014-02-22
00:58
PLATFORMS.md: Add Win64 and Win64 forwarding check-in: 90d8affe47 user: js tags: trunk
2014-02-21
17:19
Don't use objc_initializeClassPair on OS X/PPC64 check-in: 3204ceeca0 user: js tags: trunk
17:17
Cast return of sizeof() to socklen_t check-in: 3fa37632f9 user: js tags: trunk
Changes

Modified src/OFBlock.m from [02f8f90a87] to [aa21105e0f].

143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
	const char *ivar_layout;
	struct class_ext *ext;
};

struct class _NSConcreteStackBlock;
struct class _NSConcreteGlobalBlock;
struct class _NSConcreteMallocBlock;
# ifdef __OBJC2__
struct class _NSConcreteStackBlock_metaclass;
struct class _NSConcreteGlobalBlock_metaclass;
struct class _NSConcreteMallocBlock_metaclass;
# endif
#endif

static struct {







|







143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
	const char *ivar_layout;
	struct class_ext *ext;
};

struct class _NSConcreteStackBlock;
struct class _NSConcreteGlobalBlock;
struct class _NSConcreteMallocBlock;
# if defined(__OBJC2__) && !defined(__ppc64__)
struct class _NSConcreteStackBlock_metaclass;
struct class _NSConcreteGlobalBlock_metaclass;
struct class _NSConcreteMallocBlock_metaclass;
# endif
#endif

static struct {
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
			@throw [OFInitializationFailedException
			    exceptionWithClass: self];
#endif

#ifdef OF_APPLE_RUNTIME
	Class tmp;

# ifdef __OBJC2__
	tmp = objc_initializeClassPair(self, "OFStackBlock",
	    (Class)&_NSConcreteStackBlock,
	    (Class)&_NSConcreteStackBlock_metaclass);
	if (tmp == Nil)
		@throw [OFInitializationFailedException
		    exceptionWithClass: self];
	objc_registerClassPair(tmp);







|







325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
			@throw [OFInitializationFailedException
			    exceptionWithClass: self];
#endif

#ifdef OF_APPLE_RUNTIME
	Class tmp;

# if defined(__OBJC2__) && !defined(__ppc64__)
	tmp = objc_initializeClassPair(self, "OFStackBlock",
	    (Class)&_NSConcreteStackBlock,
	    (Class)&_NSConcreteStackBlock_metaclass);
	if (tmp == Nil)
		@throw [OFInitializationFailedException
		    exceptionWithClass: self];
	objc_registerClassPair(tmp);