@@ -14,14 +14,18 @@ * file. */ #include "config.h" +#define __NO_EXT_QNX + #include #include #include + #include + #include #import "OFObject.h" #import "OFAutoreleasePool.h" @@ -39,10 +43,11 @@ #if defined(OF_OBJFW_RUNTIME) # import #elif defined(OF_OLD_GNU_RUNTIME) # import # import +# import #else # import #endif #ifdef _WIN32 @@ -249,11 +254,11 @@ size_t i; for (c = self; c != Nil; c = class_get_super_class(c)) for (pl = c->protocols; pl != NULL; pl = pl->next) for (i = 0; i < pl->count; i++) - if ([pl->list[i] conformsToProtocol: protocol]) + if ([pl->list[i] conformsTo: protocol]) return YES; return NO; #else Class c; @@ -362,11 +367,11 @@ method_getTypeEncoding(method)); #endif } + (IMP)replaceClassMethod: (SEL)selector - withMethodFromClass: (Class)class; + withMethodFromClass: (Class)class { IMP newimp; if (![class isSubclassOfClass: self]) @throw [OFInvalidArgumentException newWithClass: self @@ -420,11 +425,11 @@ method_getTypeEncoding(method)); #endif } + (IMP)replaceInstanceMethod: (SEL)selector - withMethodFromClass: (Class)class; + withMethodFromClass: (Class)class { IMP newimp; if (![class isSubclassOfClass: self]) @throw [OFInvalidArgumentException newWithClass: self @@ -678,11 +683,11 @@ return [self resizeMemory: ptr toSize: nitems * size]; } -- (void)freeMemory: (void*)ptr; +- (void)freeMemory: (void*)ptr { void **iter, *last, **memchunks; size_t i, memchunks_size; if (ptr == NULL)