gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-10 00:00:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix build with libobjc2.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@30967 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
David Chisnall 2010-07-15 09:59:01 +00:00
parent 2d4d2d6dc4
commit e8e94cfcfb
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Source/GSFFIInvocation.m
View file

@ -299,15 +299,16 @@ static id gs_objc_proxy_lookup(id receiver, SEL op)
+ (void) load + (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 #if HAVE_FORWARD2
__objc_msg_forward2 = gs_objc_msg_forward2; __objc_msg_forward2 = gs_objc_msg_forward2;
#else #else
__objc_msg_forward = gs_objc_msg_forward; __objc_msg_forward = gs_objc_msg_forward;
#endif #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 #endif
} }

4
Source/NSException.m
View file

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

2
Source/NSThread.m
View file

@ -272,7 +272,7 @@ commonModes(void)
return modes; 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 /* We need to access these private vars in the objc runtime - because
the objc runtime's API is not enough powerful for the GNUstep the objc runtime's API is not enough powerful for the GNUstep
extensions we want to add. */ extensions we want to add. */

2
config/config.unexpected.m
View file

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