diff --git a/ChangeLog b/ChangeLog index 091a35529..442afd2d0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-04-11 Richard Frith-Macdonald + + * Source/Additions/GSXML.m: + * Source/Additions/GSCompatibility.m: + * Source/Additions/GSMime.m: + * Headers/Foundation/NSString.h: + * Headers/Additions/GNUstepBase/GSCategories.h: + * Headers/Additions/GNUstepBase/Unicode.h: + More macos-x portability fixups. + 2007-04-01 Richard Frith-Macdonald * Source/GSLocale.m: diff --git a/Headers/Additions/GNUstepBase/GSCategories.h b/Headers/Additions/GNUstepBase/GSCategories.h index 28f01e454..fb1784b0c 100644 --- a/Headers/Additions/GNUstepBase/GSCategories.h +++ b/Headers/Additions/GNUstepBase/GSCategories.h @@ -54,7 +54,7 @@ extern "C" { #endif -#if OS_API_VERSION(GS_API_NONE,GS_API_NONE) +#if OS_API_VERSION(GS_API_NONE,GS_API_LATEST) @class NSMutableSet; diff --git a/Headers/Additions/GNUstepBase/Unicode.h b/Headers/Additions/GNUstepBase/Unicode.h index 4b7bbcdbf..62e595e27 100644 --- a/Headers/Additions/GNUstepBase/Unicode.h +++ b/Headers/Additions/GNUstepBase/Unicode.h @@ -36,40 +36,6 @@ #import /* For standard string encodings */ -#if !defined(DEFINED_GSSTRINGENCODING) -#define DEFINED_GSSTRINGENCODING 1 -/* Additional string encodings ... must match those in Foundation/NSString.h - * until removed from there. - */ -typedef enum { -/* NB. Must not have an encoding with value zero - so we can use zero to - tell that a variable that should contain an encoding has not yet been - initialised */ - GSUndefinedEncoding = 0, - NSKOI8RStringEncoding = 50, // Russian/Cyrillic - NSISOLatin3StringEncoding = 51, // ISO-8859-3; South European - NSISOLatin4StringEncoding = 52, // ISO-8859-4; North European - NSISOCyrillicStringEncoding = 22, // ISO-8859-5 - NSISOArabicStringEncoding = 53, // ISO-8859-6 - NSISOGreekStringEncoding = 54, // ISO-8859-7 - NSISOHebrewStringEncoding = 55, // ISO-8859-8 - NSISOLatin5StringEncoding = 57, // ISO-8859-9; Turkish - NSISOLatin6StringEncoding = 58, // ISO-8859-10; Nordic - NSISOThaiStringEncoding = 59, // ISO-8859-11 -/* Possible future ISO-8859 additions - // ISO-8859-12 -*/ - NSISOLatin7StringEncoding = 61, // ISO-8859-13 - NSISOLatin8StringEncoding = 62, // ISO-8859-14 - NSISOLatin9StringEncoding = 63, // ISO-8859-15; Replaces ISOLatin1 - NSGB2312StringEncoding = 56, - NSUTF7StringEncoding = 64, // RFC 2152 - NSGSM0338StringEncoding, // GSM (mobile phone) default alphabet - NSBIG5StringEncoding, // Traditional chinese - NSKoreanEUCStringEncoding // Korean -} GSStringEncoding; -#endif - #if OS_API_VERSION(GS_API_NONE,GS_API_LATEST) #if defined(__cplusplus) diff --git a/Headers/Foundation/NSString.h b/Headers/Foundation/NSString.h index 4307276db..2ecbc9cbf 100644 --- a/Headers/Foundation/NSString.h +++ b/Headers/Foundation/NSString.h @@ -29,40 +29,6 @@ #import #import -#if !defined(DEFINED_GSSTRINGENCODING) -#define DEFINED_GSSTRINGENCODING 1 -/* Additional string encodings ... must match those in GNUstepBase/Unicode.h - * We should probably remove them from this file at some point. - */ -typedef enum { -/* NB. Must not have an encoding with value zero - so we can use zero to - tell that a variable that should contain an encoding has not yet been - initialised */ - GSUndefinedEncoding = 0, - NSKOI8RStringEncoding = 50, // Russian/Cyrillic - NSISOLatin3StringEncoding = 51, // ISO-8859-3; South European - NSISOLatin4StringEncoding = 52, // ISO-8859-4; North European - NSISOCyrillicStringEncoding = 22, // ISO-8859-5 - NSISOArabicStringEncoding = 53, // ISO-8859-6 - NSISOGreekStringEncoding = 54, // ISO-8859-7 - NSISOHebrewStringEncoding = 55, // ISO-8859-8 - NSISOLatin5StringEncoding = 57, // ISO-8859-9; Turkish - NSISOLatin6StringEncoding = 58, // ISO-8859-10; Nordic - NSISOThaiStringEncoding = 59, // ISO-8859-11 -/* Possible future ISO-8859 additions - // ISO-8859-12 -*/ - NSISOLatin7StringEncoding = 61, // ISO-8859-13 - NSISOLatin8StringEncoding = 62, // ISO-8859-14 - NSISOLatin9StringEncoding = 63, // ISO-8859-15; Replaces ISOLatin1 - NSGB2312StringEncoding = 56, - NSUTF7StringEncoding = 64, // RFC 2152 - NSGSM0338StringEncoding, // GSM (mobile phone) default alphabet - NSBIG5StringEncoding, // Traditional chinese - NSKoreanEUCStringEncoding // Korean -} GSStringEncoding; -#endif - #if defined(__cplusplus) extern "C" { #endif @@ -117,6 +83,10 @@ enum */ typedef enum _NSStringEncoding { +/* NB. Must not have an encoding with value zero - so we can use zero to + tell that a variable that should contain an encoding has not yet been + initialised */ + GSUndefinedEncoding = 0, NSASCIIStringEncoding = 1, NSNEXTSTEPStringEncoding = 2, NSJapaneseEUCStringEncoding = 3, @@ -136,6 +106,27 @@ typedef enum _NSStringEncoding NSMacOSRomanStringEncoding = 30, NSProprietaryStringEncoding = 31 + NSKOI8RStringEncoding = 50, // Russian/Cyrillic + NSISOLatin3StringEncoding = 51, // ISO-8859-3; South European + NSISOLatin4StringEncoding = 52, // ISO-8859-4; North European + NSISOCyrillicStringEncoding = 22, // ISO-8859-5 + NSISOArabicStringEncoding = 53, // ISO-8859-6 + NSISOGreekStringEncoding = 54, // ISO-8859-7 + NSISOHebrewStringEncoding = 55, // ISO-8859-8 + NSISOLatin5StringEncoding = 57, // ISO-8859-9; Turkish + NSISOLatin6StringEncoding = 58, // ISO-8859-10; Nordic + NSISOThaiStringEncoding = 59, // ISO-8859-11 +/* Possible future ISO-8859 additions + // ISO-8859-12 +*/ + NSISOLatin7StringEncoding = 61, // ISO-8859-13 + NSISOLatin8StringEncoding = 62, // ISO-8859-14 + NSISOLatin9StringEncoding = 63, // ISO-8859-15; Replaces ISOLatin1 + NSGB2312StringEncoding = 56, + NSUTF7StringEncoding = 64, // RFC 2152 + NSGSM0338StringEncoding, // GSM (mobile phone) default alphabet + NSBIG5StringEncoding, // Traditional chinese + NSKoreanEUCStringEncoding // Korean } NSStringEncoding; enum { diff --git a/Source/Additions/GSCompatibility.m b/Source/Additions/GSCompatibility.m index 1e1c005d0..296b54595 100644 --- a/Source/Additions/GSCompatibility.m +++ b/Source/Additions/GSCompatibility.m @@ -28,6 +28,12 @@ #include "GNUstepBase/GSCategories.h" #include "GNUstepBase/GCObject.h" +/* Avoid compiler warnings about internal method +*/ +@interface NSError (GNUstep) ++ (NSError*) _last; +@end + NSThread *GSCurrentThread() { return [NSThread currentThread]; diff --git a/Source/Additions/GSMime.m b/Source/Additions/GSMime.m index 2b8998ed2..1e3642aa1 100644 --- a/Source/Additions/GSMime.m +++ b/Source/Additions/GSMime.m @@ -56,6 +56,7 @@ #include "GNUstepBase/GSMime.h" #include "GNUstepBase/GSXML.h" #include "GNUstepBase/GSCategories.h" +#include "GNUstepBase/Unicode.h" #include #include diff --git a/Source/Additions/GSXML.m b/Source/Additions/GSXML.m index ed02b0180..010225a48 100644 --- a/Source/Additions/GSXML.m +++ b/Source/Additions/GSXML.m @@ -43,6 +43,7 @@ #include "config.h" #include "GNUstepBase/preface.h" #include "GNUstepBase/GSCategories.h" +#include "GNUstepBase/Unicode.h" #ifdef HAVE_LIBXML @@ -5533,7 +5534,6 @@ didReceiveAuthenticationChallenge: (NSURLAuthenticationChallenge*)challenge { NSMutableArray *params = [NSMutableArray array]; id fault = nil; - int code; NS_DURING {