sendmsg.c (__objc_get_forward_imp): Call __objc_msg_forward2 for real.

2007-04-21  Andrew Ruder  <andy@aeruder.net>

        * sendmsg.c (__objc_get_forward_imp): Call
        __objc_msg_forward2 for real.

From-SVN: r124035

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index e55fa509bebb928487ba2438c5f2a1ae8e2dd10e..7ae9dd78ed406a0a19c08226e14440fa253da87e 100644 (file)
--- 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 c1aed1c0f9a3f722dde349ccf4cec6c05bb8f7a1..a0b66baf6a2e3e923c0fb93c30c30ef98caf7404 100644 (file)
--- 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;