From e8e914434d4d5dbae334a74f3bdebdbee9a5367b Mon Sep 17 00:00:00 2001 From: rfm Date: Wed, 20 Feb 2008 08:02:28 +0000 Subject: [PATCH] Tweaks to build under leopard git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@26108 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ Headers/Additions/GNUstepBase/GSVersionMacros.h | 15 ++++++++++++++- Source/Additions/Unicode.m | 2 ++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6fa3bec63..231078c20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-02-20 Richard Frith-Macdonald + + * Source/Additions/Unicode.m: + * Headers/Additions/GNUstepBase/GSVersionMacros.h: + Minor tweaks for building under leopard. + 2008-02-19 Nicola Pero * Source/GNUmakefile (libgnustep-base_NEEDS_GUI): Set to NO diff --git a/Headers/Additions/GNUstepBase/GSVersionMacros.h b/Headers/Additions/GNUstepBase/GSVersionMacros.h index 1d68c149d..b13f1cd53 100644 --- a/Headers/Additions/GNUstepBase/GSVersionMacros.h +++ b/Headers/Additions/GNUstepBase/GSVersionMacros.h @@ -40,21 +40,34 @@ /* * For MacOS-X compatibility, we define the MacOS-X version constants and - * we allow MAC_OS_X_VERSION_MAX_ALLOWED instead of GS_OPENSTEP_V + * we allow MAC_OS_X_VERSION_MIN_ALLOWED or MAC_OS_X_VERSION_MAX_ALLOWED + * instead of GS_OPENSTEP_V */ #ifndef MAC_OS_X_VERSION_10_2 #define MAC_OS_X_VERSION_10_2 100200 #define MAC_OS_X_VERSION_10_3 100300 #define MAC_OS_X_VERSION_10_4 100400 +#define MAC_OS_X_VERSION_10_5 100500 #endif /* MAC_OS_X_VERSION_10_2 */ #ifndef GS_OPENSTEP_V +#ifdef MAC_OS_X_VERSION_MIN_ALLOWED +#define GS_OPENSTEP_V MAC_OS_X_VERSION_MIN_ALLOWED +#else #ifdef MAC_OS_X_VERSION_MAX_ALLOWED #define GS_OPENSTEP_V MAC_OS_X_VERSION_MAX_ALLOWED #endif /* MAC_OS_X_VERSION_MAX_ALLOWED */ +#endif /* MAC_OS_X_VERSION_MIN_ALLOWED */ #endif /* GS_OPENSTEP_V */ +#ifndef MAC_OS_X_VERSION_MIN_ALLOWED +#define MAC_OS_X_VERSION_MIN_ALLOWED GS_OPENSTEP_V +#endif +#ifndef MAC_OS_X_VERSION_MAX_ALLOWED +#define MAC_OS_X_VERSION_MAX_ALLOWED GS_OPENSTEP_V +#endif + /* * NB. The version values below must be integers ... by convention these are * made up of two digits each for major, minor and subminor version numbers diff --git a/Source/Additions/Unicode.m b/Source/Additions/Unicode.m index a1f918356..4b4894e0d 100644 --- a/Source/Additions/Unicode.m +++ b/Source/Additions/Unicode.m @@ -207,8 +207,10 @@ static struct _strenc_ str_encoding_table[] = { "NSISO2022JPStringEncoding","ISO-2022-JP",0,0,0}, {NSMacOSRomanStringEncoding, "NSMacOSRomanStringEncoding","MACINTOSH",0,0,0}, +#if defined(GNUSTEP) {NSProprietaryStringEncoding, "NSProprietaryStringEncoding","",0,0,0}, +#endif // GNUstep additions {NSISOCyrillicStringEncoding,