tweaks to avoid compiler warnings

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@29691 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2010-02-20 18:05:00 +00:00
parent b107ae4ac4
commit ec2ebc1c47
4 changed files with 25 additions and 14 deletions

View file

@ -218,7 +218,7 @@ typedef struct {
#define OBJC2RUNTIME @OBJC2RUNTIME@
#import <GNUstepBase/preface.h>
#include <GNUstepBase/preface.h>
#endif /* included_GSConfig_h */

View file

@ -5,13 +5,15 @@
# define OBJC_NONPORTABLE
#endif
#if !defined(__DEPRECATE_DIRECT_ACCESS) || defined(__OBJC_LEGACY_GNU_MODE__) || defined(__OBJC_RUNTIME_INTERNAL__)
# define OBJC_DEPRECATED
#else
# if ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR >= 1))
# define OBJC_DEPRECATED __attribute__((deprecated))
# else
#if !defined(OBJC_DEPRECATED)
# if !defined(__DEPRECATE_DIRECT_ACCESS) || defined(__OBJC_LEGACY_GNU_MODE__) || defined(__OBJC_RUNTIME_INTERNAL__)
# define OBJC_DEPRECATED
# else
# if ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR >= 1))
# define OBJC_DEPRECATED __attribute__((deprecated))
# else
# define OBJC_DEPRECATED
# endif
# endif
#endif

View file

@ -2,17 +2,23 @@
#include <stddef.h>
#include <sys/types.h>
#ifdef ERROR_UNSUPPORTED_RUNTIME_FUNCTIONS
#if defined(ERROR_UNSUPPORTED_RUNTIME_FUNCTIONS)
# define OBJC_GNU_RUNTIME_UNSUPPORTED(x) \
__attribute__((error(x " not supported by the GNU runtime")))
__attribute__((error(x " not supported by the GNU runtime")))
#else
# define OBJC_GNU_RUNTIME_UNSUPPORTED(x)
#endif
#if ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR >= 1))
# define OBJC_DEPRECATED __attribute__((deprecated))
#else
# define OBJC_DEPRECATED
#if !defined(OBJC_DEPRECATED)
# if !defined(__DEPRECATE_DIRECT_ACCESS) || defined(__OBJC_LEGACY_GNU_MODE__) || defined(__OBJC_RUNTIME_INTERNAL__)
# define OBJC_DEPRECATED
# else
# if ((__GNUC__ > 3) || (__GNUC__ == 3 && __GNUC_MINOR >= 1))
# define OBJC_DEPRECATED __attribute__((deprecated))
# else
# define OBJC_DEPRECATED
# endif
# endif
#endif
// Undo GNUstep substitutions

View file

@ -6,8 +6,11 @@
#import "config.h"
#import "GNUstepBase/GSConfig.h"
/* GNUstepBase/GSConfig.h includes <GNUstepBase/preface.h> so
* we import local versions first.
*/
#import "GNUstepBase/preface.h"
#import "GNUstepBase/GSConfig.h"
/* Foundation/NSObject.h imports <Foundation/NSZone.h> and
* <Foundation/NSObjCRuntime.h> so we import local versions first.