gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 08:26:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Updated headers to use the new Objective-C runtime API when using the new GNU Objective-C Runtime from GCC 4.6

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@31763 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Nicola Pero 2010-12-23 00:06:36 +00:00
parent 15d62dc9ac
commit 49e56309be
4 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
2010-12-22 Nicola Pero <nicola.pero@meta-innovation.co>
* Headers/Additions/GNUstepBase/preface.h.in: When using the new
GNU Objective-C Runtime library, include <objc/runtime.h> instead
of <objc/objc-api.h> and <objc/encoding.h>.
* Headers/Additions/GNUstepBase/GSObjCRuntime.h: When
OBJC2RUNTIME, do not include <objc/objc-api.h>.
* Headers/Additions/GNUstepBase/GSVersionMacros.h: Added FIXME.
2010-12-22 Nicola Pero <nicola.pero@meta-innovation.com>
* config/objc-common.g: Include the correct headers to use the new

2
Headers/Additions/GNUstepBase/GSObjCRuntime.h
View file

@ -35,7 +35,6 @@
#include <stdio.h>
#include <objc/objc.h>
#include <objc/objc-api.h>
#if OBJC2RUNTIME
/* We have a real ObjC2 runtime.
@ -44,6 +43,7 @@
#else
/* We emulate an ObjC2 runtime.
*/
#include <objc/objc-api.h>
#include <ObjectiveC2/runtime.h>
#endif

4
Headers/Additions/GNUstepBase/GSVersionMacros.h
View file

@ -229,6 +229,10 @@
#define GS_EXPOSE(X) (!GS_NONFRAGILE || defined(EXPOSE_##X##_IVARS))
/* Include the appropriate header for ObjC2 blocks support if it is in use.
*
* FIXME: "OBJC2RUNTIME" is set to "1" if the runtime has
* objc_setProperty(), which is unrelated to whether it has blocks
* support or not.
*/
#if __has_feature(blocks)
# if OBJC2RUNTIME

9
Headers/Additions/GNUstepBase/preface.h.in
View file

@ -88,6 +88,7 @@
#include <stdint.h>
#endif
/* FIXME: Should not all these includes go in GSObjCRuntime.h ? */
#if NeXT_RUNTIME
#include <objc/objc.h>
#include <objc/objc-class.h>
@ -109,8 +110,12 @@
#define _C_ONEWAY 'V'
#else /* GNU Objective C Runtime */
#include <objc/objc.h>
#include <objc/objc-api.h>
#include <objc/encoding.h>
#if defined (__GNU_LIBOBJC__)
#include <objc/runtime.h>
#else
#include <objc/objc-api.h>
#include <objc/encoding.h>
#endif
#endif
// Include the blocks runtime header if it's available (It shouldn't matter