diff --git a/Documentation/Base.ispell b/Documentation/Base.ispell index 63671acbd..8c1a22361 100644 --- a/Documentation/Base.ispell +++ b/Documentation/Base.ispell @@ -879,7 +879,6 @@ groupsByEvent GSApplicationSupportDirectory GSAtomicMallocZone GSBreakTime -GSCategories GSCurrentThread GSCurrentThreadDictionary GSDebugAllocation diff --git a/Headers/Additions/GNUstepBase/GSCategories.h b/Headers/Additions/GNUstepBase/GSCategories.h deleted file mode 100644 index 922fc09ca..000000000 --- a/Headers/Additions/GNUstepBase/GSCategories.h +++ /dev/null @@ -1,128 +0,0 @@ -/** Declaration of extension methods and functions for standard classes - - Copyright (C) 2003 Free Software Foundation, Inc. - - Written by: Richard Frith-Macdonald - and: Adam Fedor - - This file is part of the GNUstep Base Library. - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Library General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02111 USA. - -*/ - -#ifndef INCLUDED_GS_CATEGORIES_H -#define INCLUDED_GS_CATEGORIES_H -#include "GNUstepBase/GSVersionMacros.h" - - -/* The following ifndef prevents the categories declared in this file being - * seen in GNUstep code. This is necessary because those category - * declarations are also present in the header files for the corresponding - * classes in GNUstep. The separate category declarations in this file - * are only needed for software using the GNUstep Additions library - * without the main GNUstep base library. - */ -#ifndef GNUSTEP - -#include - -#ifdef NeXT_Foundation_LIBRARY -#include -#endif - -#include "GNUstepBase/preface.h" -#include "GNUstepBase/GSObjCRuntime.h" -#include "GNUstepBase/GNUstep.h" - -#if defined(__cplusplus) -extern "C" { -#endif - -#if OS_API_VERSION(GS_API_NONE,GS_API_LATEST) - -/* Taken from base/Headers/Foundation/NSString.h */ -typedef enum _NSGNUstepStringEncoding -{ -/* 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, - -// GNUstep additions - 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, -#if MAC_OS_X_VERSION_10_4 >= MAC_OS_X_VERSION_MAX_ALLOWED - NSUTF16BigEndianStringEncoding = 0x90000100, /* NSUTF16StringEncoding encoding with explicit endianness specified */ - NSUTF16LittleEndianStringEncoding = 0x94000100, /* NSUTF16StringEncoding encoding with explicit endianness specified */ - - NSUTF32StringEncoding = 0x8c000100, - NSUTF32BigEndianStringEncoding = 0x98000100, /* NSUTF32StringEncoding encoding with explicit endianness specified */ - NSUTF32LittleEndianStringEncoding = 0x9c000100, /* NSUTF32StringEncoding encoding with explicit endianness specified */ -#endif - - GSEncodingUnusedLast -} NSGNUstepStringEncoding; - - - -/* ------------------------------------------------------------------------ - * Functions - */ - -/* - Similar to the GSCompatibility methods, - these functions are implemented in - Source/Additions/GSCompatibility.m - for gnustep-baseadd only. - The implementations for gnustep-base reside in the - corresponding source files of -base. -*/ -GS_EXPORT NSArray *NSStandardLibraryPaths(void); -GS_EXPORT void NSDecimalFromComponents(NSDecimal *result, - unsigned long long mantissa, - short exponent, BOOL negative); - -#endif /* OS_API_VERSION(GS_API_NONE,GS_API_NONE) */ - -#if defined(__cplusplus) -} -#endif - -#endif /* GNUSTEP */ - -#endif /* INCLUDED_GS_CATEGORIES_H */ - - diff --git a/Headers/Additions/GNUstepBase/GSFileHandle.h b/Headers/Additions/GNUstepBase/GSFileHandle.h index b0b254dd5..5c20fa93d 100644 --- a/Headers/Additions/GNUstepBase/GSFileHandle.h +++ b/Headers/Additions/GNUstepBase/GSFileHandle.h @@ -36,6 +36,11 @@ #include #endif +/** + * DO NOT USE ... this header is here only for the SSL file handle support + * and is not intended to be used by anyone else ... it is subject to + * change or removal without warning. + */ @interface GSFileHandle : NSFileHandle { #if GS_EXPOSE(GSFileHandle) @@ -64,9 +69,6 @@ WSAEVENT event; #endif #endif -#if !GS_NONFRAGILE - void *_unused; -#endif } - (id) initAsClientAtAddress: (NSString*)address diff --git a/Headers/Foundation/NSObject.h b/Headers/Foundation/NSObject.h index f987161ea..62b8489b5 100644 --- a/Headers/Foundation/NSObject.h +++ b/Headers/Foundation/NSObject.h @@ -22,7 +22,6 @@ Boston, MA 02111 USA. AutogsdocSource: NSObject.m - AutogsdocSource: Additions/GSCategories.m */ #ifndef __NSObject_h_GNUSTEP_BASE_INCLUDE diff --git a/Source/DocMakefile b/Source/DocMakefile index d3e7eb292..b42514803 100644 --- a/Source/DocMakefile +++ b/Source/DocMakefile @@ -139,8 +139,6 @@ GNUstep.h \ GSBlocks.h \ GSVersionMacros.h \ GSObjCRuntime.h \ -GSCategories.h \ -GSFileHandle.h \ GSUnion.h \ GSIArray.h \ GSIMap.h \ diff --git a/Source/GNUmakefile b/Source/GNUmakefile index 9b0cc36a2..5a72260d8 100644 --- a/Source/GNUmakefile +++ b/Source/GNUmakefile @@ -109,7 +109,6 @@ ADD_HEADERS = \ GSBlocks.h \ GSVersionMacros.h \ GSObjCRuntime.h \ -GSCategories.h \ GSFileHandle.h \ GSUnion.h \ GSIArray.h \