Fix build with libobjc2.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@30967 72102866-910b-0410-8b05-ffd578937521

Source/GSFFIInvocation.m

@@ -299,15 +299,16 @@ static id gs_objc_proxy_lookup(id receiver, SEL op)
 
 + (void) load
 {
+#ifdef __GNUSTEP_RUNTIME__
+  pthread_key_create(&thread_slot_key, free);
+  objc_msg_forward3 = gs_objc_msg_forward3;
+  objc_proxy_lookup = gs_objc_proxy_lookup;
+#else
 #if	HAVE_FORWARD2
   __objc_msg_forward2 = gs_objc_msg_forward2;
 #else
   __objc_msg_forward = gs_objc_msg_forward;
 #endif
-#ifdef __GNUSTEP_RUNTIME__
-  pthread_key_create(&thread_slot_key, free);
-  objc_msg_forward3 = gs_objc_msg_forward3;
-  objc_proxy_lookup = gs_objc_proxy_lookup;
 #endif
 }
 

Source/NSException.m

@@ -40,6 +40,10 @@
 #import "Foundation/NSValue.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
 
+#ifdef __GNUSTEP_RUNTIME__
+#include <objc/hooks.h>
+#endif
+
 #ifdef HAVE_MALLOC_H
 #include <malloc.h>
 #endif

Source/NSThread.m

@@ -272,7 +272,7 @@ commonModes(void)
   return modes;
 }
 
-#if !defined(HAVE_OBJC_THREAD_ADD) && !defined(NeXT_RUNTIME)
+#if !defined(HAVE_OBJC_THREAD_ADD) && !defined(NeXT_RUNTIME) && !defined(__GNUSTEP_RUNTIME__)
 /* We need to access these private vars in the objc runtime - because
    the objc runtime's API is not enough powerful for the GNUstep
    extensions we want to add.  */

config/config.unexpected.m

@@ -1,5 +1,5 @@
 
-#include "objc-common.g"
+extern void (*_objc_unexpected_exception)(id);
 
 int main (void)
 {