public
Description: Io programming language
Homepage: http://iolanguage.com
Clone URL: git://github.com/stevedekorte/io.git
Fix building the ObjcBridge addon:
Rename `class_addMethod' to `Io_class_addMethod'
The former has a clashing definition in /usr/include/objc/runtime.h (on OS 
X.5)
mkhl (author)
Wed Mar 26 08:41:37 -0700 2008
commit  b19ba0864ab62962e5ce3f62b0412cc64032bacf
tree    eb694851117c1bbdb4c61674de9513f4d9a22b2d
parent  ac037d7e300a8ceff2ade30b5468bd2789f7ccb3
...
290
291
292
293
294
295
296
 
 
 
 
297
298
299
...
326
327
328
329
 
330
331
332
...
335
336
337
338
 
339
340
341
...
345
346
347
348
 
349
350
351
...
290
291
292
 
 
 
 
293
294
295
296
297
298
299
...
326
327
328
 
329
330
331
332
...
335
336
337
 
338
339
340
341
...
345
346
347
 
348
349
350
351
0
@@ -290,10 +290,10 @@ Io2Objc *Io2Objc_newSubclassNamed(Io2Objc *self, IoObject *locals, IoMessage *m)
0
 {
0
   Class class = objc_makeClass(IoMessage_locals_cStringArgAt_(m, locals, 0), DATA(self)->object->isa->name, NO);
0
   objc_addClass(class);
0
- class_addMethod(class, sel_getUid("forwardInvocation:"), "v12@0:4@8", (IMP)forwardInvocation, NO);
0
- class_addMethod(class, sel_getUid("forwardInvocation:"), "v12@0:4@8", (IMP)forwardInvocation, YES);
0
- class_addMethod(class, sel_getUid("respondsToSelector:"), "C12@0:4:8", (IMP)respondsToSelector, YES);
0
- class_addMethod(class, sel_getUid("methodSignatureForSelector:"), "@12@0:4:8", (IMP)methodSignatureForSelector, YES);
0
+ Io_class_addMethod(class, sel_getUid("forwardInvocation:"), "v12@0:4@8", (IMP)forwardInvocation, NO);
0
+ Io_class_addMethod(class, sel_getUid("forwardInvocation:"), "v12@0:4@8", (IMP)forwardInvocation, YES);
0
+ Io_class_addMethod(class, sel_getUid("respondsToSelector:"), "C12@0:4:8", (IMP)respondsToSelector, YES);
0
+ Io_class_addMethod(class, sel_getUid("methodSignatureForSelector:"), "@12@0:4:8", (IMP)methodSignatureForSelector, YES);
0
   ((IoObjcBridgeData *)DATA(DATA(self)->bridge))->allClasses = NULL;
0
   return IoObjcBridge_proxyForId_(DATA(self)->bridge, class);
0
 }
0
@@ -326,7 +326,7 @@ IoObject *Io2Objc_setSlot(Io2Objc *self, IoObject *locals, IoMessage *m)
0
     {
0
       SEL selector = sel_get_typed_uid(CSTRING(slotName), method->method_types);
0
       if (!selector) selector = sel_register_typed_name(CSTRING(slotName), method->method_types);
0
- class_addMethod(class, selector, method->method_types, __objc_get_forward_imp(selector), YES);
0
+ Io_class_addMethod(class, selector, method->method_types, __objc_get_forward_imp(selector), YES);
0
     }
0
     else
0
     {
0
@@ -335,7 +335,7 @@ IoObject *Io2Objc_setSlot(Io2Objc *self, IoObject *locals, IoMessage *m)
0
       {
0
         SEL selector = sel_get_typed_uid(CSTRING(slotName), encoding);
0
         if (!selector) selector = sel_register_typed_name(CSTRING(slotName), encoding);
0
- class_addMethod(class, selector, encoding, __objc_get_forward_imp(selector), YES);
0
+ Io_class_addMethod(class, selector, encoding, __objc_get_forward_imp(selector), YES);
0
       }
0
       else
0
       {
0
@@ -345,7 +345,7 @@ IoObject *Io2Objc_setSlot(Io2Objc *self, IoObject *locals, IoMessage *m)
0
         types[2] = ':';
0
         SEL selector = sel_get_typed_uid(CSTRING(slotName), types);
0
         if (!selector) selector = sel_register_typed_name(CSTRING(slotName), types);
0
- class_addMethod(class, selector, types, __objc_get_forward_imp(selector), YES);
0
+ Io_class_addMethod(class, selector, types, __objc_get_forward_imp(selector), YES);
0
         objc_free(types);
0
       }
0
     }
...
45
46
47
48
 
49
50
...
45
46
47
 
48
49
50
0
@@ -45,6 +45,6 @@
0
 - (unsigned int)argumentSizeAtIndex:(unsigned int)index;
0
 @end
0
 Class objc_makeClass(const char *name, const char *superName, BOOL isMetaClass);
0
-void class_addMethod(Class class, SEL sel, const char *types, IMP imp, BOOL toInstanceMethods);
0
+void Io_class_addMethod(Class class, SEL sel, const char *types, IMP imp, BOOL toInstanceMethods);
0
 
0
 #endif
...
48
49
50
51
 
52
53
54
...
48
49
50
 
51
52
53
54
0
@@ -48,7 +48,7 @@ Class objc_makeClass(const char *name, const char *superName, BOOL isMetaClass)
0
   return class;
0
 }
0
 
0
-void class_addMethod(Class class, SEL sel, const char *types, IMP imp, BOOL toInstanceMethods)
0
+void Io_class_addMethod(Class class, SEL sel, const char *types, IMP imp, BOOL toInstanceMethods)
0
 {
0
   if (class == 0) return;
0
   if (toInstanceMethods == NO) class = class->isa;

Comments

    No one has commented yet.