From cf3822f181e345f952f1497d24a854ffd50cdb9e Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Sat, 9 Oct 2010 22:22:23 +0000 Subject: In libobjc/: 2010-10-10 Nicola Pero In libobjc/: 2010-10-10 Nicola Pero * objc-foreach.c: Include objc-private/common.h. * objc/deprecated/METHOD_NULL.h: New file. * objc/objc-api.h: Include deprecated/METHOD_NULL.h instead of defining METHOD_NULL here. * Makefile.in (OBJC_DEPRECATED_H): Added METHOD_NULL.h. * Object.m ([+instancesRespondTo:]): Use (Method_t)0 instead of METHOD_NULL. ([-respondsTo:]): Same change. * objc/objc-api.h (method_get_imp): Converted it into a normal function so that we can hide the internals of struct objc_method. * sendmsg.c (method_get_imp): Implemented. From-SVN: r165241 --- libobjc/objc/deprecated/METHOD_NULL.h | 2 ++ libobjc/objc/objc-api.h | 11 +++-------- 2 files changed, 5 insertions(+), 8 deletions(-) create mode 100644 libobjc/objc/deprecated/METHOD_NULL.h (limited to 'libobjc/objc') diff --git a/libobjc/objc/deprecated/METHOD_NULL.h b/libobjc/objc/deprecated/METHOD_NULL.h new file mode 100644 index 0000000..6912be3 --- /dev/null +++ b/libobjc/objc/deprecated/METHOD_NULL.h @@ -0,0 +1,2 @@ +/* For functions which return Method_t */ +#define METHOD_NULL (Method_t)0 diff --git a/libobjc/objc/objc-api.h b/libobjc/objc/objc-api.h index ff457f2..5f90430 100644 --- a/libobjc/objc/objc-api.h +++ b/libobjc/objc/objc-api.h @@ -40,9 +40,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see extern "C" { #endif /* __cplusplus */ -/* For functions which return Method_t */ -#define METHOD_NULL (Method_t)0 - /* Boolean typedefs */ +#include "deprecated/METHOD_NULL.h" + /* Method descriptor returned by introspective Object methods. This is really just the first part of the more complete objc_method structure defined below and used internally by the runtime. */ @@ -441,11 +440,7 @@ extern void class_ivar_set_gcinvisible (Class _class, const char* ivarname, BOOL gcInvisible); -static inline IMP -method_get_imp(Method_t method) -{ - return (method!=METHOD_NULL)?method->method_imp:(IMP)0; -} +objc_EXPORT IMP method_get_imp(Method_t method); objc_EXPORT IMP get_imp (Class _class, SEL sel); -- cgit v1.1