mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-30 00:11:26 +00:00
Header reorganizsateion - Please refer to ChangeLog
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@17407 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
15430c49b1
commit
73dc4cb9f6
238 changed files with 694 additions and 544 deletions
|
@ -33,9 +33,9 @@
|
|||
#include <Foundation/Foundation.h>
|
||||
#endif
|
||||
|
||||
#include "gnustep/base/GSObjCRuntime.h"
|
||||
#include "gnustep/base/GCObject.h"
|
||||
#include "gnustep/base/GNUstep.h"
|
||||
#include "GNUstepBase/GSObjCRuntime.h"
|
||||
#include "GNUstepBase/GCObject.h"
|
||||
#include "GNUstepBase/GNUstep.h"
|
||||
|
||||
@implementation GCArray
|
||||
|
||||
|
|
|
@ -31,8 +31,8 @@
|
|||
#include <Foundation/Foundation.h>
|
||||
#endif
|
||||
|
||||
#include "gnustep/base/GSObjCRuntime.h"
|
||||
#include "gnustep/base/GCObject.h"
|
||||
#include "GNUstepBase/GSObjCRuntime.h"
|
||||
#include "GNUstepBase/GCObject.h"
|
||||
#include "GSCompatibility.h"
|
||||
|
||||
typedef struct {
|
||||
|
|
|
@ -37,7 +37,7 @@
|
|||
#include <Foundation/Foundation.h>
|
||||
#endif
|
||||
|
||||
#include "gnustep/base/GCObject.h"
|
||||
#include "GNUstepBase/GCObject.h"
|
||||
#include "GSCompatibility.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
#include "config.h"
|
||||
#include <string.h>
|
||||
#include <Foundation/Foundation.h>
|
||||
#include "gnustep/base/GSCategories.h"
|
||||
#include "GNUstepBase/GSCategories.h"
|
||||
#include "GSCompatibility.h"
|
||||
|
||||
/**
|
||||
|
|
|
@ -29,9 +29,9 @@
|
|||
#include <string.h>
|
||||
#include <Foundation/Foundation.h>
|
||||
#include <CoreFoundation/CFString.h>
|
||||
#include "gnustep/base/preface.h"
|
||||
#include "gnustep/base/GSObjCRuntime.h"
|
||||
#include "gnustep/base/GNUstep.h"
|
||||
#include "GNUstepBase/preface.h"
|
||||
#include "GNUstepBase/GSObjCRuntime.h"
|
||||
#include "GNUstepBase/GNUstep.h"
|
||||
|
||||
@class NSMutableSet;
|
||||
|
||||
|
@ -39,11 +39,11 @@
|
|||
* Macros
|
||||
*/
|
||||
|
||||
// Following are also defined in gnustep-base/Headers/gnustep/base/NSObject.h
|
||||
// Following are also defined in base/Headers/Foundation/NSObject.h
|
||||
#define IF_NO_GC(x) \
|
||||
x
|
||||
|
||||
// Following are also defined in gnustep-base/Headers/gnustep/base/NSDebug.h
|
||||
// Following are also defined in base/Headers/Foundation/NSDebug.h
|
||||
#ifdef DEBUG
|
||||
#define NSDebugLLog(level, format, args...) \
|
||||
do { if (GSDebugSet(level) == YES) \
|
||||
|
@ -114,7 +114,7 @@
|
|||
format: @"in %s, range { %u, %u } extends beyond size (%u)", \
|
||||
sel_get_name(_cmd), RANGE.location, RANGE.length, SIZE]
|
||||
|
||||
/* Taken from gnustep-base/Headers/gnustep/base/NSString.h */
|
||||
/* 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
|
||||
|
|
|
@ -25,8 +25,8 @@
|
|||
#include "config.h"
|
||||
#include <objc/objc-class.h>
|
||||
#include "GSCompatibility.h"
|
||||
#include "gnustep/base/GSCategories.h"
|
||||
#include "gnustep/base/GCObject.h"
|
||||
#include "GNUstepBase/GSCategories.h"
|
||||
#include "GNUstepBase/GCObject.h"
|
||||
|
||||
/* FIXME: Need to initialize this */
|
||||
NSRecursiveLock *gnustep_global_lock = NULL;
|
||||
|
|
|
@ -52,8 +52,8 @@
|
|||
|
||||
#include "config.h"
|
||||
#include <Foundation/Foundation.h>
|
||||
#include "gnustep/base/GSMime.h"
|
||||
#include "gnustep/base/GSCategories.h"
|
||||
#include "GNUstepBase/GSMime.h"
|
||||
#include "GNUstepBase/GSCategories.h"
|
||||
#include <string.h>
|
||||
#include <ctype.h>
|
||||
#include "GSCompatibility.h"
|
||||
|
|
|
@ -24,7 +24,7 @@
|
|||
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include "gnustep/base/preface.h"
|
||||
#include "GNUstepBase/preface.h"
|
||||
#ifndef ROUND
|
||||
#define ROUND(V, A) \
|
||||
({ typeof(V) __v=(V); typeof(A) __a=(A); \
|
||||
|
|
|
@ -29,7 +29,7 @@
|
|||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include "gnustep/base/preface.h"
|
||||
#include "GNUstepBase/preface.h"
|
||||
#ifndef NeXT_Foundation_LIBRARY
|
||||
#include <Foundation/NSArray.h>
|
||||
#include <Foundation/NSAutoreleasePool.h>
|
||||
|
@ -46,8 +46,8 @@
|
|||
#else
|
||||
#include <Foundation/Foundation.h>
|
||||
#endif
|
||||
#include "gnustep/base/GSObjCRuntime.h"
|
||||
#include "gnustep/base/GNUstep.h"
|
||||
#include "GNUstepBase/GSObjCRuntime.h"
|
||||
#include "GNUstepBase/GNUstep.h"
|
||||
#include "GSCompatibility.h"
|
||||
#include <string.h>
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
#ifdef HAVE_LIBXML
|
||||
|
||||
#include "gnustep/base/GSXML.h"
|
||||
#include "GNUstepBase/GSXML.h"
|
||||
#ifndef NeXT_Foundation_LIBRARY
|
||||
#include <Foundation/NSData.h>
|
||||
#include <Foundation/NSValue.h>
|
||||
|
|
|
@ -52,8 +52,12 @@ endif
|
|||
ADDITIONAL_CFLAGS =
|
||||
|
||||
# Additional include directories the compiler should search
|
||||
ADDITIONAL_INCLUDE_DIRS = -I../../Headers/gnustep -I../../Headers \
|
||||
-I../$(GNUSTEP_TARGET_DIR)
|
||||
ADDITIONAL_INCLUDE_DIRS = -I../../Headers/Additions \
|
||||
-I../$(GNUSTEP_TARGET_DIR)
|
||||
|
||||
ifeq ($(FOUNDATION_LIB),gnu)
|
||||
ADDITIONAL_INCLUDE_DIRS += -I../../Headers
|
||||
endif
|
||||
|
||||
# Additional LDFLAGS to pass to the linker
|
||||
ADDITIONAL_LDFLAGS =
|
||||
|
|
|
@ -40,22 +40,22 @@
|
|||
#include <Foundation/Foundation.h>
|
||||
#endif
|
||||
#include "GSCompatibility.h"
|
||||
#include "gnustep/base/Unicode.h"
|
||||
#include "GNUstepBase/Unicode.h"
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
typedef struct {unichar from; unsigned char to;} _ucc_;
|
||||
|
||||
#include "unicode/cyrillic.h"
|
||||
#include "unicode/latin2.h"
|
||||
#include "unicode/latin9.h"
|
||||
#include "unicode/nextstep.h"
|
||||
#include "unicode/caseconv.h"
|
||||
#include "unicode/cop.h"
|
||||
#include "unicode/decomp.h"
|
||||
#include "unicode/gsm0338.h"
|
||||
#include "unicode/thai.h"
|
||||
#include "GNUstepBase/unicode/cyrillic.h"
|
||||
#include "GNUstepBase/unicode/latin2.h"
|
||||
#include "GNUstepBase/unicode/latin9.h"
|
||||
#include "GNUstepBase/unicode/nextstep.h"
|
||||
#include "GNUstepBase/unicode/caseconv.h"
|
||||
#include "GNUstepBase/unicode/cop.h"
|
||||
#include "GNUstepBase/unicode/decomp.h"
|
||||
#include "GNUstepBase/unicode/gsm0338.h"
|
||||
#include "GNUstepBase/unicode/thai.h"
|
||||
|
||||
#ifdef HAVE_ICONV
|
||||
#ifdef HAVE_GICONV_H
|
||||
|
|
|
@ -50,8 +50,8 @@
|
|||
|
||||
#include "config.h"
|
||||
#include <stdio.h>
|
||||
#include "gnustep/base/preface.h"
|
||||
#include "gnustep/base/behavior.h"
|
||||
#include "GNUstepBase/preface.h"
|
||||
#include "GNUstepBase/behavior.h"
|
||||
#ifndef NeXT_Foundation_LIBRARY
|
||||
#include <Foundation/NSException.h>
|
||||
#include <Foundation/NSString.h>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue