Ticket #35325: patch-Modules.diff

objc/objc-runtime-compat.m

@@ -981 +981 @@
 
 #endif
 
-#if defined(__x86_64__)
 
-@implementation Protocol (NSOBjectCompat)
-- self
-{
-        return self;
-}
-@end
-
-@implementation Object (NSOBjectCompat)
-- self
-{
-        return self;
-}
-
--doesNotRecognizeSelector:(SEL)sel
-{
-        printf("--> %s\n", sel_getName(sel));
-        abort();
-}
-@end
-        
-
-#endif

objc/objc_support.m

@@ -150 +150 @@
 -(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
 @end /* PyObjCSupport */
 
-@implementation Protocol (PyObjCSupport)
 
--(PyObject*)__pyobjc_PythonObject__
-{
-        PyObject *rval;
-
-        rval = PyObjC_FindPythonProxy(self);
-        if (rval == NULL) {
-                rval = PyObjCFormalProtocol_ForProtocol(self);
-        }
-        return rval;
-}
-
--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
-{
-        PyObject *rval;
-
-        *cookie = 0;
-        rval = PyObjC_FindPythonProxy(self);
-        if (rval == NULL) {
-                rval = PyObjCFormalProtocol_ForProtocol(self);
-        }
-        return rval;
-}
-
-@end /* PyObjCSupport */
-
-@interface Object (PyObjCSupport)
--(PyObject*)__pyobjc_PythonObject__;
--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie;
-@end /* PyObjCSupport */
-
-@implementation Object (PyObjCSupport)
-
--(PyObject*)__pyobjc_PythonObject__
-{
-        PyObject *rval;
-
-        rval = PyObjC_FindPythonProxy(self);
-        if (rval == NULL) {
-                rval = (PyObject *)PyObjCObject_New(self,
-                                PyObjCObject_kCLASSIC, NO);
-                PyObjC_RegisterPythonProxy(self, rval);
-        }
-        return rval;
-}
-
--(PyObject*)__pyobjc_PythonTransient__:(int*)cookie
-{
-        PyObject *rval;
-
-        *cookie = 0;
-        rval = PyObjC_FindPythonProxy(self);
-        if (rval == NULL) {
-                rval = (PyObject *)PyObjCObject_New(self,
-                                PyObjCObject_kCLASSIC, NO);
-                PyObjC_RegisterPythonProxy(self, rval);
-        }
-        return rval;
-}
-
-@end /* PyObjCSupport */
 
 @interface NSString (PyObjCSupport)
 -(PyObject*)__pyobjc_PythonObject__;

objc/selector.m

@@ -798 +798 @@
                 }
         }
 
-        if (Object_class == nil) {
-                Object_class = [Object class];
-        }
 
         if (name[0] == '_' && name[1] == '_') {
                 /* No known Objective-C class has methods whose name