gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-31 08:41:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

macos-x portability fixups

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@24980 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2007-04-11 04:45:49 +00:00
parent 1e5f17853c
commit 9d18cfbcfa
7 changed files with 44 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
2007-04-11 Richard Frith-Macdonald <rfm@gnu.org>
* 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 <rfm@gnu.org> 2007-04-01 Richard Frith-Macdonald <rfm@gnu.org>
* Source/GSLocale.m: * Source/GSLocale.m:

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

@ -54,7 +54,7 @@
extern "C" { extern "C" {
#endif #endif
#if OS_API_VERSION(GS_API_NONE,GS_API_NONE) #if OS_API_VERSION(GS_API_NONE,GS_API_LATEST)
@class NSMutableSet; @class NSMutableSet;

34
Headers/Additions/GNUstepBase/Unicode.h
View file

@ -36,40 +36,6 @@
#import <Foundation/NSString.h> /* For standard string encodings */ #import <Foundation/NSString.h> /* 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 OS_API_VERSION(GS_API_NONE,GS_API_LATEST)
#if defined(__cplusplus) #if defined(__cplusplus)

59
Headers/Foundation/NSString.h
View file

@ -29,40 +29,6 @@
#import <Foundation/NSObject.h> #import <Foundation/NSObject.h>
#import <Foundation/NSRange.h> #import <Foundation/NSRange.h>
#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) #if defined(__cplusplus)
extern "C" { extern "C" {
#endif #endif
@ -117,6 +83,10 @@ enum
*/ */
typedef enum _NSStringEncoding 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, NSASCIIStringEncoding = 1,
NSNEXTSTEPStringEncoding = 2, NSNEXTSTEPStringEncoding = 2,
NSJapaneseEUCStringEncoding = 3, NSJapaneseEUCStringEncoding = 3,
@ -136,6 +106,27 @@ typedef enum _NSStringEncoding
NSMacOSRomanStringEncoding = 30, NSMacOSRomanStringEncoding = 30,
NSProprietaryStringEncoding = 31 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; } NSStringEncoding;
enum { enum {

6
Source/Additions/GSCompatibility.m
View file

@ -28,6 +28,12 @@
#include "GNUstepBase/GSCategories.h" #include "GNUstepBase/GSCategories.h"
#include "GNUstepBase/GCObject.h" #include "GNUstepBase/GCObject.h"
/* Avoid compiler warnings about internal method
*/
@interface NSError (GNUstep)
+ (NSError*) _last;
@end
NSThread *GSCurrentThread() NSThread *GSCurrentThread()
{ {
return [NSThread currentThread]; return [NSThread currentThread];

1
Source/Additions/GSMime.m
View file

@ -56,6 +56,7 @@
#include "GNUstepBase/GSMime.h" #include "GNUstepBase/GSMime.h"
#include "GNUstepBase/GSXML.h" #include "GNUstepBase/GSXML.h"
#include "GNUstepBase/GSCategories.h" #include "GNUstepBase/GSCategories.h"
#include "GNUstepBase/Unicode.h"
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>

2
Source/Additions/GSXML.m
View file

@ -43,6 +43,7 @@
#include "config.h" #include "config.h"
#include "GNUstepBase/preface.h" #include "GNUstepBase/preface.h"
#include "GNUstepBase/GSCategories.h" #include "GNUstepBase/GSCategories.h"
#include "GNUstepBase/Unicode.h"
#ifdef HAVE_LIBXML #ifdef HAVE_LIBXML
@ -5533,7 +5534,6 @@ didReceiveAuthenticationChallenge: (NSURLAuthenticationChallenge*)challenge
{ {
NSMutableArray *params = [NSMutableArray array]; NSMutableArray *params = [NSMutableArray array];
id fault = nil; id fault = nil;
int code;
NS_DURING NS_DURING
{ {