Tweaks to build under leopard

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@26108 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2008-02-20 08:02:28 +00:00
parent b8183cde37
commit e8e914434d
3 changed files with 22 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2008-02-20 Richard Frith-Macdonald <rfm@gnu.org>
* Source/Additions/Unicode.m:
* Headers/Additions/GNUstepBase/GSVersionMacros.h:
Minor tweaks for building under leopard.
2008-02-19 Nicola Pero <nicola.pero@meta-innovation.com> 2008-02-19 Nicola Pero <nicola.pero@meta-innovation.com>
* Source/GNUmakefile (libgnustep-base_NEEDS_GUI): Set to NO * Source/GNUmakefile (libgnustep-base_NEEDS_GUI): Set to NO

View file

@ -40,21 +40,34 @@
/* /*
* For MacOS-X compatibility, we define the MacOS-X version constants and * 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 #ifndef MAC_OS_X_VERSION_10_2
#define MAC_OS_X_VERSION_10_2 100200 #define MAC_OS_X_VERSION_10_2 100200
#define MAC_OS_X_VERSION_10_3 100300 #define MAC_OS_X_VERSION_10_3 100300
#define MAC_OS_X_VERSION_10_4 100400 #define MAC_OS_X_VERSION_10_4 100400
#define MAC_OS_X_VERSION_10_5 100500
#endif /* MAC_OS_X_VERSION_10_2 */ #endif /* MAC_OS_X_VERSION_10_2 */
#ifndef GS_OPENSTEP_V #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 #ifdef MAC_OS_X_VERSION_MAX_ALLOWED
#define GS_OPENSTEP_V 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_MAX_ALLOWED */
#endif /* MAC_OS_X_VERSION_MIN_ALLOWED */
#endif /* GS_OPENSTEP_V */ #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 * 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 * made up of two digits each for major, minor and subminor version numbers

View file

@ -207,8 +207,10 @@ static struct _strenc_ str_encoding_table[] = {
"NSISO2022JPStringEncoding","ISO-2022-JP",0,0,0}, "NSISO2022JPStringEncoding","ISO-2022-JP",0,0,0},
{NSMacOSRomanStringEncoding, {NSMacOSRomanStringEncoding,
"NSMacOSRomanStringEncoding","MACINTOSH",0,0,0}, "NSMacOSRomanStringEncoding","MACINTOSH",0,0,0},
#if defined(GNUSTEP)
{NSProprietaryStringEncoding, {NSProprietaryStringEncoding,
"NSProprietaryStringEncoding","",0,0,0}, "NSProprietaryStringEncoding","",0,0,0},
#endif
// GNUstep additions // GNUstep additions
{NSISOCyrillicStringEncoding, {NSISOCyrillicStringEncoding,