summaryrefslogtreecommitdiff
path: root/libobjc
diff options
context:
space:
mode:
authorpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2007-04-22 04:44:37 +0000
committerpinskia <pinskia@138bc75d-0d04-0410-961f-82ee72b054a4>2007-04-22 04:44:37 +0000
commit4f80b75acee54e7747ab706ce5d402f5c7ecc773 (patch)
tree5ea9dd4a44b6c9deacdc6a55e9684e0829e25213 /libobjc
parentb37237260c7e238f066b35e1eda5ea4ee0b81eab (diff)
downloadgcc-4f80b75acee54e7747ab706ce5d402f5c7ecc773.tar.gz
2007-04-21 Andrew Ruder <andy@aeruder.net>
* sendmsg.c (__objc_get_forward_imp): Call __objc_msg_forward2 for real. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124035 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
-rw-r--r--libobjc/ChangeLog5
-rw-r--r--libobjc/sendmsg.c6
2 files changed, 11 insertions, 0 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index e55fa509beb..7ae9dd78ed4 100644
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-21 Andrew Ruder <andy@aeruder.net>
+
+ * sendmsg.c (__objc_get_forward_imp): Call
+ __objc_msg_forward2 for real.
+
2007-04-09 Andrew Ruder <andy@aeruder.net>
* sendmsg.c: Added __objc_msg_forward2, a hook that allows
diff --git a/libobjc/sendmsg.c b/libobjc/sendmsg.c
index c1aed1c0f9a..a0b66baf6a2 100644
--- a/libobjc/sendmsg.c
+++ b/libobjc/sendmsg.c
@@ -96,6 +96,12 @@ __objc_get_forward_imp (id rcv, SEL sel)
/* If a custom forwarding hook was registered, try getting a forwarding
function from it. There are two forward routine hooks, one that
takes the receiver as an argument and one that does not. */
+ if (__objc_msg_forward2)
+ {
+ IMP result;
+ if ((result = __objc_msg_forward2 (rcv, sel)) != NULL)
+ return result;
+ }
if (__objc_msg_forward)
{
IMP result;