Portability tweaks

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33999 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-10-15 07:59:19 +00:00
parent 4cc58b721a
commit 1d6c3a2a72
7 changed files with 3052 additions and 17069 deletions

View file

@ -15,36 +15,37 @@ void __objc_update_dispatch_table_for_class(Class);
extern struct sarray *__objc_uninstalled_dtable;
extern objc_mutex_t __objc_runtime_mutex;
static void createNSBlockSubclass(Class superclass, Class newClass,
Class metaClass, char *name)
static void
createNSBlockSubclass(Class superclass, Class newClass,
Class metaClass, char *name)
{
// Initialize the metaclass
metaClass->class_pointer = superclass->class_pointer;
metaClass->super_class = superclass->class_pointer;
metaClass->info = _CLS_META;
metaClass->dtable = __objc_uninstalled_dtable;
// Initialize the metaclass
metaClass->class_pointer = superclass->class_pointer;
metaClass->super_class = superclass->class_pointer;
metaClass->info = _CLS_META;
metaClass->dtable = __objc_uninstalled_dtable;
// Set up the new class
newClass->class_pointer = metaClass;
newClass->super_class = superclass;
newClass->name = name;
newClass->info = _CLS_CLASS;
newClass->dtable = __objc_uninstalled_dtable;
// Set up the new class
newClass->class_pointer = metaClass;
newClass->super_class = superclass;
newClass->name = name;
newClass->info = _CLS_CLASS;
newClass->dtable = __objc_uninstalled_dtable;
// Initialize the dispatch table for the class and metaclass.
__objc_update_dispatch_table_for_class(metaClass);
__objc_update_dispatch_table_for_class(newClass);
CLS_SETINITIALIZED(metaClass);
CLS_SETINITIALIZED(newClass);
CLS_SETRESOLV(metaClass);
CLS_SETRESOLV(newClass);
// Add pointer from super class
objc_mutex_lock(__objc_runtime_mutex);
newClass->sibling_class = newClass->super_class->subclass_list;
newClass->super_class->subclass_list = newClass;
metaClass->sibling_class = metaClass->super_class->subclass_list;
metaClass->super_class->subclass_list = metaClass;
objc_mutex_unlock(__objc_runtime_mutex);
// Initialize the dispatch table for the class and metaclass.
__objc_update_dispatch_table_for_class(metaClass);
__objc_update_dispatch_table_for_class(newClass);
CLS_SETINITIALIZED(metaClass);
CLS_SETINITIALIZED(newClass);
CLS_SETRESOLV(metaClass);
CLS_SETRESOLV(newClass);
// Add pointer from super class
objc_mutex_lock(__objc_runtime_mutex);
newClass->sibling_class = newClass->super_class->subclass_list;
newClass->super_class->subclass_list = newClass;
metaClass->sibling_class = metaClass->super_class->subclass_list;
metaClass->super_class->subclass_list = metaClass;
objc_mutex_unlock(__objc_runtime_mutex);
}
#define NEW_CLASS(super, sub) \
@ -52,10 +53,10 @@ static void createNSBlockSubclass(Class superclass, Class newClass,
BOOL objc_create_block_classes_as_subclasses_of(Class super)
{
if (_NSBlock.super_class != NULL) { return NO; }
if (_NSBlock.super_class != NULL) { return NO; }
NEW_CLASS(super, _NSBlock);
NEW_CLASS(&_NSBlock, _NSConcreteStackBlock);
NEW_CLASS(&_NSBlock, _NSConcreteGlobalBlock);
return YES;
NEW_CLASS(super, _NSBlock);
NEW_CLASS(&_NSBlock, _NSConcreteStackBlock);
NEW_CLASS(&_NSBlock, _NSConcreteGlobalBlock);
return YES;
}