mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 08:21:25 +00:00
Include fixes for darwin
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@18413 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
c1d4c8962a
commit
107b64be5e
8 changed files with 36 additions and 9 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
||||||
|
2004-01-14 Adam Fedor <fedor@gnu.org>
|
||||||
|
|
||||||
|
* Source/Additions/GSObjCRuntime.m: Fix previous method def.
|
||||||
|
* Source/Additions/GSXML.m: Idem.
|
||||||
|
|
||||||
|
* Tools/GNUmakefile (TOOL_NAME): Add cvtenc plmerge sfparse xmlparse
|
||||||
|
for add=yes.
|
||||||
|
* Tools/cvtenc.m: Add includes for compiling with darwin.
|
||||||
|
* Tools/plmerge.m, Tools/sfparse.m, Tools/xmlparse.m: Idem.
|
||||||
|
Suggestions and patches from Stephane Corthesy.
|
||||||
|
|
||||||
2004-01-13 Richard Frith-Macdonald <rfm@gnu.org>
|
2004-01-13 Richard Frith-Macdonald <rfm@gnu.org>
|
||||||
|
|
||||||
* Source/NSURLHandle.m: ([-availableResourceData]) remove condition
|
* Source/NSURLHandle.m: ([-availableResourceData]) remove condition
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
|
|
||||||
#ifdef NeXT_Foundation_LIBRARY
|
#ifdef NeXT_Foundation_LIBRARY
|
||||||
@interface NSObject (MissingFromMacOSX)
|
@interface NSObject (MissingFromMacOSX)
|
||||||
- (IMP) methodForSelector: (SEL)aSelector;
|
+ (IMP) methodForSelector: (SEL)aSelector;
|
||||||
@end
|
@end
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -102,6 +102,12 @@ UTF8StrLen(const unsigned char *bytes, unsigned length)
|
||||||
|
|
||||||
static BOOL cacheDone = NO;
|
static BOOL cacheDone = NO;
|
||||||
|
|
||||||
|
#ifdef NeXT_Foundation_LIBRARY
|
||||||
|
@interface NSObject (MissingFromMacOSX)
|
||||||
|
+ (IMP) methodForSelector: (SEL)aSelector;
|
||||||
|
@end
|
||||||
|
#endif
|
||||||
|
|
||||||
static void
|
static void
|
||||||
setupCache()
|
setupCache()
|
||||||
{
|
{
|
||||||
|
@ -119,12 +125,6 @@ static xmlParserInputPtr
|
||||||
loadEntityFunction(const unsigned char *url, const unsigned char *eid,
|
loadEntityFunction(const unsigned char *url, const unsigned char *eid,
|
||||||
xmlParserCtxtPtr ctxt);
|
xmlParserCtxtPtr ctxt);
|
||||||
|
|
||||||
#ifdef NeXT_Foundation_LIBRARY
|
|
||||||
@interface NSObject (MissingFromMacOSX)
|
|
||||||
- (IMP) methodForSelector: (SEL)aSelector;
|
|
||||||
@end
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@interface GSXPathObject(Private)
|
@interface GSXPathObject(Private)
|
||||||
+ (id) _newWithNativePointer: (xmlXPathObject *)lib
|
+ (id) _newWithNativePointer: (xmlXPathObject *)lib
|
||||||
context: (GSXPathContext *)context;
|
context: (GSXPathContext *)context;
|
||||||
|
|
|
@ -47,7 +47,7 @@ MAN8_PAGES = gdomap.8
|
||||||
|
|
||||||
# The application to be compiled
|
# The application to be compiled
|
||||||
ifeq ($(add),yes)
|
ifeq ($(add),yes)
|
||||||
TOOL_NAME = autogsdoc
|
TOOL_NAME = autogsdoc cvtenc plmerge sfparse xmlparse
|
||||||
else
|
else
|
||||||
TOOL_NAME = autogsdoc cvtenc gdnc defaults plmerge \
|
TOOL_NAME = autogsdoc cvtenc gdnc defaults plmerge \
|
||||||
plparse sfparse pldes plser pl2link xmlparse
|
plparse sfparse pldes plser pl2link xmlparse
|
||||||
|
|
|
@ -29,6 +29,9 @@
|
||||||
#include <Foundation/NSDebug.h>
|
#include <Foundation/NSDebug.h>
|
||||||
#include <Foundation/NSFileHandle.h>
|
#include <Foundation/NSFileHandle.h>
|
||||||
#include <Foundation/NSAutoreleasePool.h>
|
#include <Foundation/NSAutoreleasePool.h>
|
||||||
|
#ifdef NeXT_Foundation_LIBRARY
|
||||||
|
#include "GNUstepBase/GSCategories.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <ctype.h>
|
#include <ctype.h>
|
||||||
|
|
||||||
|
@ -75,7 +78,7 @@ main(int argc, char** argv, char **env)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
NSStringEncoding *e;
|
const NSStringEncoding *e;
|
||||||
NSMutableString *names;
|
NSMutableString *names;
|
||||||
|
|
||||||
names = [NSMutableString stringWithCapacity: 1024];
|
names = [NSMutableString stringWithCapacity: 1024];
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
#include <Foundation/Foundation.h>
|
#include <Foundation/Foundation.h>
|
||||||
#include <Foundation/NSArray.h>
|
#include <Foundation/NSArray.h>
|
||||||
#include <Foundation/NSAutoreleasePool.h>
|
#include <Foundation/NSAutoreleasePool.h>
|
||||||
|
@ -27,6 +28,10 @@
|
||||||
#include <Foundation/NSFileManager.h>
|
#include <Foundation/NSFileManager.h>
|
||||||
#include <Foundation/NSProcessInfo.h>
|
#include <Foundation/NSProcessInfo.h>
|
||||||
#include <Foundation/NSString.h>
|
#include <Foundation/NSString.h>
|
||||||
|
#ifdef NeXT_Foundation_LIBRARY
|
||||||
|
#include "GNUstepBase/GSCategories.h"
|
||||||
|
#include "GNUstepBase/GSObjCRuntime.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char** argv, char **env)
|
main(int argc, char** argv, char **env)
|
||||||
|
|
|
@ -27,6 +27,9 @@
|
||||||
#include <Foundation/NSUserDefaults.h>
|
#include <Foundation/NSUserDefaults.h>
|
||||||
#include <Foundation/NSDebug.h>
|
#include <Foundation/NSDebug.h>
|
||||||
#include <Foundation/NSAutoreleasePool.h>
|
#include <Foundation/NSAutoreleasePool.h>
|
||||||
|
#ifdef NeXT_Foundation_LIBRARY
|
||||||
|
#include "GNUstepBase/GSCategories.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
int
|
int
|
||||||
convert_unicode(NSArray *args)
|
convert_unicode(NSArray *args)
|
||||||
|
|
|
@ -22,10 +22,15 @@
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
|
#ifdef NeXT_Foundation_LIBRARY
|
||||||
|
#include <Foundation/Foundation.h>
|
||||||
|
#include <GNUstepBase/GSCategories.h>
|
||||||
|
#else
|
||||||
#include <Foundation/NSArray.h>
|
#include <Foundation/NSArray.h>
|
||||||
#include <Foundation/NSAutoreleasePool.h>
|
#include <Foundation/NSAutoreleasePool.h>
|
||||||
#include <Foundation/NSObjCRuntime.h>
|
#include <Foundation/NSObjCRuntime.h>
|
||||||
#include <Foundation/NSProcessInfo.h>
|
#include <Foundation/NSProcessInfo.h>
|
||||||
|
#endif
|
||||||
#include <GNUstepBase/GSXML.h>
|
#include <GNUstepBase/GSXML.h>
|
||||||
|
|
||||||
@interface GSXMLParser (Loader)
|
@interface GSXMLParser (Loader)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue