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:
David Ayers 2003-07-31 23:49:32 +00:00
parent 9cc6c39319
commit ac30183cd6
238 changed files with 694 additions and 544 deletions

View file

@ -1,3 +1,4 @@
config.h
*_bas.m *_cbs.m
AUTHORS
Foundation

View file

@ -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

View file

@ -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 {

View file

@ -37,7 +37,7 @@
#include <Foundation/Foundation.h>
#endif
#include "gnustep/base/GCObject.h"
#include "GNUstepBase/GCObject.h"
#include "GSCompatibility.h"
/*

View file

@ -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"
/**

View file

@ -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

View file

@ -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;

View file

@ -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"

View file

@ -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); \

View file

@ -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>

View file

@ -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>

View file

@ -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 =

View file

@ -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

View file

@ -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>

View file

@ -0,0 +1,58 @@
# -*-makefile-*-
# CompatibilityHeaders.make
#
# Create compatibility headers so that code written before the big header
# move will continue to compile (for a while).
#
# Copyright (C) 2003 Free Software Foundation, Inc.
#
#
# Author: Alexander Malmberg <alexander@malmberg.org>
# Date: 2003-07-29
#
# This file is part of the GNUstep project.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# You should have received a copy of the GNU General Public
# License along with this library; see the file COPYING.LIB.
# If not, write to the Free Software Foundation,
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
# The usage should be fairly obvious. For each pair of OLD_DIR and NEW_DIR,
# make a copy and set OLD_DIR, NEW_DIR, and LIST. Note that LIST must be
# non-empty; if there are no files for a pair, remove it completely.
after-install::
@echo Installing compatibility headers...
@OLD_DIR=Foundation; NEW_DIR=GNUstepBase; \
LIST="GSXML.h GSMime.h" ;\
$(MKDIRS) $(GNUSTEP_HEADERS)/$$OLD_DIR; \
for I in $$LIST ; do \
(echo "#warning $$I is now included using the path <$$NEW_DIR/$$I>";\
echo "#include <$$NEW_DIR/$$I>" ) \
> $(GNUSTEP_HEADERS)/$$OLD_DIR/$$I; \
done
@OLD_DIR=gnustep/unicode; NEW_DIR=GNUstepBase/unicode; \
LIST="caseconv.h cop.h cyrillic.h latin2.h decomp.h nextstep.h" ;\
$(MKDIRS) $(GNUSTEP_HEADERS)/$$OLD_DIR; \
for I in $$LIST ; do \
(echo "#warning $$I is now included using the path <$$NEW_DIR/$$I>";\
echo "#include <$$NEW_DIR/$$I>" ) \
> $(GNUSTEP_HEADERS)/$$OLD_DIR/$$I;\
done
@OLD_DIR=gnustep/base; NEW_DIR=GNUstepBase; \
LIST="$(GNU_HEADERS)" ;\
$(MKDIRS) $(GNUSTEP_HEADERS)/$$OLD_DIR; \
for I in $$LIST ; do \
(echo "#warning $$I is now included using the path <$$NEW_DIR/$$I>";\
echo "#include <$$NEW_DIR/$$I>" ) \
> $(GNUSTEP_HEADERS)/$$OLD_DIR/$$I; \
done

View file

@ -140,8 +140,8 @@ Base_AGSDOC_FLAGS = \
BaseAdditions_AGSDOC_FLAGS = \
-DocumentationDirectory ../Documentation/BaseAdditions \
-HeaderDirectory ../Headers/gnustep/base \
-Declared gnustep/base \
-HeaderDirectory ../Headers/Additions/GNUstepBase \
-Declared GNUstepBase \
-Standards YES \
-ConstantsTemplate TypesAndConstants \
-FunctionsTemplate Functions \

View file

@ -109,27 +109,28 @@ win32-def.top \
libgnustep-base.def
ADD_HEADERS = \
GCObject.h \
GSCategories.h \
GSObjCRuntime.h \
Unicode.h \
GNUstep.h \
behavior.h \
objc-gnu2next.h
GNU_HEADERS = $(ADD_HEADERS) \
DistributedObjects.h \
GSCategories.h \
GSFileHandle.h \
GSLocale.h \
GSUnion.h \
GSIArray.h \
GSIMap.h \
objc-load.h \
preface.h
GCObject.h \
GSMime.h \
GSXML.h \
GSLocale.h \
Unicode.h \
GNUstep.h \
behavior.h \
preface.h \
objc-gnu2next.h
GNU_HEADERS = $(ADD_HEADERS)
ifneq ($(OBJC_RUNTIME_LIB), gnu)
GNU_HEADERS += thr-mach.h
endif
# GNUStep source files
BASE_MFILES = \
@ -260,8 +261,6 @@ tzfile.h
FOUNDATION_HEADERS = \
Foundation.h \
GSMime.h \
GSXML.h \
NSArchiver.h \
NSArray.h \
NSAttributedString.h \
@ -344,7 +343,7 @@ HEADERS_INSTALL = $(GNU_HEADERS) \
GENERATED_HFILES = \
dynamic-load.h \
$(HEADER_DIR)/preface.h \
$(HEADER_DIR_BASE)/preface.h \
$(GNUSTEP_TARGET_DIR)/mframe.h \
$(GNUSTEP_TARGET_DIR)/config.h \
$(GNUSTEP_TARGET_DIR)/GSConfig.h
@ -356,7 +355,7 @@ libgnustep-base_OBJC_FILES = $(GNU_MFILES) \
# Extra DLL exports file
libgnustep-base_DLL_DEF = libgnustep-base.def
libgnustep-base_HEADER_FILES_DIR = $(HEADER_DIR)
libgnustep-base_HEADER_FILES_DIR = $(HEADER_DIR_FND)
libgnustep-base_HEADER_FILES_INSTALL_DIR = /Foundation
libgnustep-base_HEADER_FILES = $(FOUNDATION_HEADERS)
@ -368,3 +367,5 @@ libgnustep-base_HEADER_FILES = $(FOUNDATION_HEADERS)
include $(GNUSTEP_MAKEFILES)/library.make
-include Makefile.postamble
include CompatibilityHeaders.make

View file

@ -25,9 +25,9 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSArray.h"
#include "gnustep/base/GSObjCRuntime.h"
#include "GNUstepBase/GSObjCRuntime.h"
#include "Foundation/NSException.h"
#include "Foundation/NSPortCoder.h"
#include "Foundation/NSDebug.h"

View file

@ -44,7 +44,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSAttributedString.h"
#include "Foundation/NSException.h"
#include "Foundation/NSRange.h"
@ -103,7 +103,7 @@ static NSDictionary *blank;
#define GSI_MAP_VTYPES GSUNION_INT
#define GSI_MAP_NOCLEAN 1
#include "gnustep/base/GSIMap.h"
#include "GNUstepBase/GSIMap.h"
static NSLock *attrLock = nil;
static GSIMapTable_t attrMap;

View file

@ -36,7 +36,7 @@
#define GSI_MAP_KTYPES GSUNION_OBJ
#define GSI_MAP_VTYPES GSUNION_INT
#include "gnustep/base/GSIMap.h"
#include "GNUstepBase/GSIMap.h"
@interface GSCountedSet : NSCountedSet
{

View file

@ -31,7 +31,7 @@
#include "Foundation/NSPortCoder.h"
#include "Foundation/NSDebug.h"
#include "gnustep/base/GSObjCRuntime.h"
#include "GNUstepBase/GSObjCRuntime.h"
/*
* The 'Fastmap' stuff provides an inline implementation of a mapping
@ -44,7 +44,7 @@
#define GSI_MAP_RETAIN_KEY(M, X) ((id)(X).obj) = \
[((id)(X).obj) copyWithZone: map->zone]
#include "gnustep/base/GSIMap.h"
#include "GNUstepBase/GSIMap.h"
@interface GSDictionary : NSDictionary
{

View file

@ -24,7 +24,7 @@
#include "Foundation/NSCoder.h"
#include "Foundation/NSDistantObject.h"
#include "Foundation/NSDebug.h"
#include "gnustep/base/GSInvocation.h"
#include "GSInvocation.h"
#include <config.h>
#include <objc/objc-api.h>
#include <avcall.h>
@ -115,7 +115,7 @@ ReturnTypeEqualsReturnType (vacallReturnTypeInfo *a, vacallReturnTypeInfo *b)
#define GSI_MAP_RELEASE_VAL(M, X)
#define GSI_MAP_NOCLEAN 1
#include "gnustep/base/GSIMap.h"
#include "GNUstepBase/GSIMap.h"
/* This determines the number of precomputed
callback data entries. The list is indexed

View file

@ -25,7 +25,7 @@
#include "Foundation/NSDistantObject.h"
#include "Foundation/NSData.h"
#include "Foundation/NSDebug.h"
#include "gnustep/base/GSInvocation.h"
#include "GSInvocation.h"
#include <config.h>
#include <objc/objc-api.h>
#include "cifframe.h"

View file

@ -35,7 +35,7 @@
#include "Foundation/NSLock.h"
#include "Foundation/NSFileHandle.h"
#include "Foundation/NSDebug.h"
#include "Foundation/GSMime.h"
#include "GNUstepBase/GSMime.h"
GS_EXPORT NSString * const GSTelnetNotification;
GS_EXPORT NSString * const GSTelnetErrorKey;

View file

@ -24,13 +24,13 @@
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSObject.h"
#include "Foundation/NSData.h"
#include "Foundation/NSArray.h"
#include "Foundation/NSString.h"
#include "Foundation/NSFileHandle.h"
#include "Foundation/GSFileHandle.h"
#include "GNUstepBase/GSFileHandle.h"
#include "Foundation/NSException.h"
#include "Foundation/NSRunLoop.h"
#include "Foundation/NSNotification.h"

43
Source/GSFormat.h Normal file
View file

@ -0,0 +1,43 @@
/* GSFormat - printf-style formatting
Copyright (C) 2000 Free Software Foundation, Inc.
Written by: Kai Henningsen <kai@cats.ms>
Created: Jan 2001
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 Library 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 Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
*/
#ifndef __GSFormat_H_
#define __GSFormat_H_
#include <Foundation/NSZone.h>
@class NSDictionary;
typedef struct {
unichar *buf;
size_t len;
size_t size;
NSZone *z;
} FormatBuf_t;
void
GSFormat(FormatBuf_t *fb, const unichar *fmt, va_list ap, NSDictionary *loc);
#endif

View file

@ -40,7 +40,7 @@
#include "config.h"
#include <stdio.h>
#include <string.h>
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSString.h"
#include "Foundation/NSArray.h"
#include "Foundation/NSCharacterSet.h"
@ -60,8 +60,8 @@
#include "Foundation/NSLock.h"
#include "Foundation/NSZone.h"
#include "Foundation/NSDebug.h"
#include "gnustep/base/GSFormat.h"
#include "gnustep/base/GSLocale.h"
#include "GNUstepBase/GSLocale.h"
#include "GSFormat.h"
#include <limits.h>
#include <string.h> // for strstr()
#include <sys/stat.h>
@ -98,7 +98,7 @@ typedef unsigned long long uintmax_t;
#endif
#endif
#include "gnustep/base/Unicode.h"
#include "GNUstepBase/Unicode.h"
struct printf_info
{

View file

@ -37,7 +37,7 @@
#include "Foundation/NSFileHandle.h"
#include "Foundation/NSDebug.h"
#include "Foundation/NSProcessInfo.h"
#include "Foundation/GSMime.h"
#include "GNUstepBase/GSMime.h"
#include <string.h>
#ifdef HAVE_UNISTD_H
#include <unistd.h>

64
Source/GSInvocation.h Normal file
View file

@ -0,0 +1,64 @@
/* Interface for NSInvocation concrete classes for GNUStep
Copyright (C) 1998 Free Software Foundation, Inc.
Written: Adam Fedor <fedor@gnu.org>
Date: Nov 2000
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 Library 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 Library General Public
License along with this library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
*/
#ifndef __GSInvocation_h_GNUSTEP_BASE_INCLUDE
#define __GSInvocation_h_GNUSTEP_BASE_INCLUDE
#include <Foundation/NSInvocation.h>
@interface GSFFIInvocation : NSInvocation
{
}
@end
@interface GSFFCallInvocation : NSInvocation
{
}
@end
@interface GSFrameInvocation : NSInvocation
{
}
@end
@interface NSInvocation (DistantCoding)
- (BOOL) encodeWithDistantCoder: (NSCoder*)coder passPointers: (BOOL)passp;
@end
extern void
GSFFCallInvokeWithTargetAndImp(NSInvocation *inv, id anObject, IMP imp);
extern void
GSFFIInvokeWithTargetAndImp(NSInvocation *inv, id anObject, IMP imp);
#define CLEAR_RETURN_VALUE_IF_OBJECT do { if (_validReturn && *_info[0].type == _C_ID) \
{ \
RELEASE (*(id*) _retval); \
*(id*) _retval = nil; \
_validReturn = NO; \
}\
} while (0)
#define RETAIN_RETURN_VALUE do { if (*_info[0].type == _C_ID) RETAIN (*(id*) _retval);} while (0)
#endif

View file

@ -22,7 +22,7 @@
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
*/
#include "config.h"
#include "gnustep/base/GSLocale.h"
#include "GNUstepBase/GSLocale.h"
#include "Foundation/NSDictionary.h"
#include "Foundation/NSArray.h"
#include "Foundation/NSLock.h"

View file

@ -24,7 +24,7 @@
#include "config.h"
#include "Foundation/NSSet.h"
#include "gnustep/base/GSObjCRuntime.h"
#include "GNUstepBase/GSObjCRuntime.h"
#include "Foundation/NSAutoreleasePool.h"
#include "Foundation/NSArray.h"
#include "Foundation/NSException.h"
@ -37,7 +37,7 @@
#define GSI_MAP_HAS_VALUE 0
#define GSI_MAP_KTYPES GSUNION_OBJ
#include "gnustep/base/GSIMap.h"
#include "GNUstepBase/GSIMap.h"
static SEL memberSel;

View file

@ -33,7 +33,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSString.h"
#include "Foundation/NSCoder.h"
#include "Foundation/NSArray.h"
@ -45,15 +45,15 @@
#include "Foundation/NSValue.h"
#include "Foundation/NSDebug.h"
#include "Foundation/NSObjCRuntime.h"
#include "gnustep/base/GSFormat.h"
#include "gnustep/base/GSObjCRuntime.h"
#include "GNUstepBase/GSObjCRuntime.h"
#include "GSFormat.h"
#include <limits.h>
#include "GSPrivate.h"
/* memcpy(), strlen(), strcmp() are gcc builtin's */
#include "gnustep/base/Unicode.h"
#include "GNUstepBase/Unicode.h"
#ifdef NeXT_RUNTIME
/* Used by the Darwin/NeXT ObjC Runtime

View file

@ -22,7 +22,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSArray.h"
#include "Foundation/NSNotification.h"
#include "Foundation/NSException.h"

View file

@ -28,7 +28,7 @@
#include "Foundation/NSException.h"
#include "Foundation/NSCoder.h"
#include "Foundation/NSObjCRuntime.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
/* This file should be run through a preprocessor with the macro TYPE_ORDER

View file

@ -29,7 +29,7 @@
#include "Foundation/NSCoder.h"
#include "Foundation/NSZone.h"
#include "Foundation/NSObjCRuntime.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
@interface GSValue : NSValue
{

View file

@ -48,19 +48,18 @@ before-all:: $(GENERATED_HFILES)
#
# Unfortunately the way the header files are placed in relationship
# to the source we must install the GNU header manually
# Ayers 2003-07-31: This statement should be reevaluated!
after-install::
for file in $(GNU_HEADERS); do \
$(INSTALL_DATA) ../Headers/gnustep/base/$$file \
$(GNUSTEP_HEADERS)/gnustep/base/$$file ; \
$(INSTALL_DATA) ../Headers/Additions/GNUstepBase/$$file \
$(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \
done
for file in $(UNICODE_HEADERS); do \
$(INSTALL_DATA) ../Headers/gnustep/$$file \
$(GNUSTEP_HEADERS)/gnustep/$$file ; \
$(INSTALL_DATA) ../Headers/Additions/GNUstepBase/$$file \
$(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \
done
$(INSTALL_DATA) $(GNUSTEP_TARGET_DIR)/GSConfig.h \
$(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)
$(INSTALL_DATA) $(GNUSTEP_TARGET_DIR)/mframe.h \
$(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)
if [ "$(INSTALL_ROOT_DIR)" = "" ]; then \
services=/etc/services; \
if [ "`$(WHOAMI)`" != root ]; then \
@ -83,13 +82,12 @@ after-install::
# Things to do after uninstalling
after-uninstall::
for file in $(GNU_HEADERS); do \
rm -f $(GNUSTEP_HEADERS)/gnustep/base/$$file ; \
rm -f $(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \
done
for file in $(UNICODE_HEADERS); do \
rm -f $(GNUSTEP_HEADERS)/gnustep/$$file ; \
rm -f $(GNUSTEP_HEADERS)/GNUstepBase/$$file ; \
done
rm -f $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)/GSConfig.h
rm -f $(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)/mframe.h
# Things to do before cleaning
# before-clean::
@ -131,19 +129,19 @@ dynamic-load.h: ../config.status
rm -f dynamic-load.h
cp $(srcdir)/$(DYNAMIC_LINKER)-load.h dynamic-load.h
$(GNUSTEP_OBJ_DIR)/preface${OEXT}: $(HEADER_DIR)/preface.h
$(GNUSTEP_OBJ_DIR)/preface${OEXT}: $(HEADER_DIR_BASE)/preface.h
#
# The config.h file is specific to a target
#
$(GNUSTEP_TARGET_DIR)/config.h: ../config.status
$(MKDIRS) $(GNUSTEP_TARGET_DIR)
-mv $(HEADER_DIR)/config.h $(GNUSTEP_TARGET_DIR)
-mv $(HEADER_DIR_BASE)/config.h $(GNUSTEP_TARGET_DIR)
-touch $(GNUSTEP_TARGET_DIR)/config.h
$(GNUSTEP_TARGET_DIR)/GSConfig.h: ../config.status
$(MKDIRS) $(GNUSTEP_TARGET_DIR)
-mv $(HEADER_DIR)/GSConfig.h $(GNUSTEP_TARGET_DIR)
-mv $(HEADER_DIR_BASE)/GSConfig.h $(GNUSTEP_TARGET_DIR)
-touch $(GNUSTEP_TARGET_DIR)/GSConfig.h
$(GNUSTEP_TARGET_DIR)/mframe.h: mframe/config.status
@ -200,7 +198,7 @@ $(GNUSTEP_OBJ_DIR)/NSPortCoder.o \
$(GNUSTEP_OBJ_DIR)/NSRunLoop.o \
$(GNUSTEP_OBJ_DIR)/NSSerializer.o \
$(GNUSTEP_OBJ_DIR)/NSUnarchiver.o \
: $(HEADER_DIR)/GSIArray.h $(HEADER_DIR)/GSUnion.h
: $(HEADER_DIR_BASE)/GSIArray.h $(HEADER_DIR_BASE)/GSUnion.h
#
# Files that include GSIMap.h will need a rebuild if it is changed.
@ -218,7 +216,7 @@ $(GNUSTEP_OBJ_DIR)/NSNotificationCenter.o \
$(GNUSTEP_OBJ_DIR)/NSObject.o \
$(GNUSTEP_OBJ_DIR)/NSPortCoder.o \
$(GNUSTEP_OBJ_DIR)/NSSerializer.o \
: $(HEADER_DIR)/GSIMap.h $(HEADER_DIR)/GSUnion.h
: $(HEADER_DIR_BASE)/GSIMap.h $(HEADER_DIR_BASE)/GSUnion.h
#
# Files that include NSObjCRuntime.h will need a rebuild if it is changed.
@ -234,7 +232,7 @@ $(GNUSTEP_OBJ_DIR)/NSObject.o \
$(GNUSTEP_OBJ_DIR)/NSSerializer.o \
$(GNUSTEP_OBJ_DIR)/NSString.o \
$(GNUSTEP_OBJ_DIR)/NSUnarchiver.o \
: $(HEADER_DIR)/NSObjCRuntime.h
: $(HEADER_DIR_FND)/NSObjCRuntime.h
#
# Files that include GSeq.h will need a rebuild if it is changed.
@ -247,7 +245,7 @@ $(GNUSTEP_OBJ_DIR)/GSString.o \
# NSGeometry.m needs a recompile if NSGeometry.h is changed.
#
$(GNUSTEP_OBJ_DIR)/NSGeometry.o \
: $(HEADER_DIR)/NSGeometry.h
: $(HEADER_DIR_FND)/NSGeometry.h
#
@ -282,4 +280,5 @@ TAGS: $(DIST_FILES)
regenerate: $(DIST_FILES)
mv AUTHORS ..
FORCE:

View file

@ -62,7 +62,7 @@ ADDITIONAL_OBJCFLAGS =
ADDITIONAL_CFLAGS =
# Additional include directories the compiler should search
ADDITIONAL_INCLUDE_DIRS = -I../Headers/gnustep -I../Headers \
ADDITIONAL_INCLUDE_DIRS = -I../Headers/Additions -I../Headers \
-I./$(GNUSTEP_TARGET_DIR)
# Additional LDFLAGS to pass to the linker
@ -86,9 +86,10 @@ endif
#
# Additional directories to be created during installation
ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/gnustep/base \
$(GNUSTEP_HEADERS)/gnustep/unicode \
ADDITIONAL_INSTALL_DIRS = $(GNUSTEP_HEADERS)/Foundation \
$(GNUSTEP_HEADERS)/GNUstepBase/unicode \
$(GNUSTEP_HEADERS)/$(GNUSTEP_TARGET_DIR)
HEADER_DIR=$(srcdir)/../Headers/gnustep/base
HEADER_DIR_BASE=$(srcdir)/../Headers/Additions/GNUstepBase
HEADER_DIR_FND =$(srcdir)/../Headers/Foundation

View file

@ -36,7 +36,7 @@
#define GSI_MAP_EQUAL(M, X,Y) ((X).uint == (Y).uint)
#define GSI_MAP_NOCLEAN 1
#include "gnustep/base/GSIMap.h"
#include "GNUstepBase/GSIMap.h"
#define _IN_NSARCHIVER_M
#include "Foundation/NSArchiver.h"

View file

@ -43,7 +43,7 @@
#include "Foundation/NSMapTable.h"
#include "Foundation/NSLock.h"
#include "Foundation/NSDebug.h"
#include "gnustep/base/GSCategories.h"
#include "GNUstepBase/GSCategories.h"
#include "GSPrivate.h"
extern BOOL GSMacOSXCompatiblePropertyLists(void);

View file

@ -25,7 +25,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSException.h"
#include "Foundation/NSDictionary.h"
#include "Foundation/NSObjCRuntime.h"

View file

@ -47,8 +47,8 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "gnustep/base/Unicode.h"
#include "GNUstepBase/preface.h"
#include "GNUstepBase/Unicode.h"
#include "Foundation/NSAttributedString.h"
#include "Foundation/NSException.h"

View file

@ -26,7 +26,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSAutoreleasePool.h"
#include "Foundation/NSException.h"
#include "Foundation/NSThread.h"

View file

@ -31,8 +31,8 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "Foundation/objc-load.h"
#include "GNUstepBase/preface.h"
#include "objc-load.h"
#include "Foundation/NSBundle.h"
#include "Foundation/NSException.h"
#include "Foundation/NSString.h"

View file

@ -41,7 +41,7 @@
#include "Foundation/NSUserDefaults.h"
#include "Foundation/NSAutoreleasePool.h"
#include "Foundation/NSDebug.h"
#include "gnustep/base/GSObjCRuntime.h"
#include "GNUstepBase/GSObjCRuntime.h"
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>

View file

@ -29,7 +29,7 @@
/**** Included Headers *******************************************************/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "NSCallBacks.h"
#include "Foundation/NSObject.h"
#include "Foundation/NSString.h"

View file

@ -26,7 +26,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSData.h"
#include "Foundation/NSCoder.h"
#include "Foundation/NSSerialization.h"

View file

@ -26,7 +26,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSObjCRuntime.h"
#include "GSConfig.h"
#include "Foundation/NSConcreteNumber.h"

View file

@ -29,7 +29,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#ifdef HAVE_FLOAT_H
#include <float.h>
#endif
@ -45,7 +45,7 @@
#define GSI_MAP_EQUAL(M, X,Y) ((X).ptr == (Y).ptr)
#define GSI_MAP_NOCLEAN 1
#include "gnustep/base/GSIMap.h"
#include "GNUstepBase/GSIMap.h"
#define _IN_CONNECTION_M
#include "Foundation/NSConnection.h"
@ -59,7 +59,7 @@
#endif
#include "Foundation/NSPortCoder.h"
#include "gnustep/base/DistributedObjects.h"
#include "GNUstepBase/DistributedObjects.h"
#include "Foundation/NSHashTable.h"
#include "Foundation/NSMapTable.h"
@ -78,7 +78,7 @@
#include "Foundation/NSPortNameServer.h"
#include "Foundation/NSNotification.h"
#include "Foundation/NSDebug.h"
#include "gnustep/base/GSInvocation.h"
#include "GSInvocation.h"
#define F_LOCK(X) {NSDebugFLLog(@"GSConnection",@"Lock %@",X);[X lock];}
#define F_UNLOCK(X) {NSDebugFLLog(@"GSConnection",@"Unlock %@",X);[X unlock];}

View file

@ -25,7 +25,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSObject.h"
NSObject *NSCopyObject(NSObject *anObject, unsigned extraBytes, NSZone *zone)

View file

@ -65,7 +65,7 @@
*/
#include "config.h"
#include "gnustep/base/GSObjCRuntime.h"
#include "GNUstepBase/GSObjCRuntime.h"
#include "Foundation/NSObjCRuntime.h"
#include "Foundation/NSByteOrder.h"
#include "Foundation/NSCoder.h"

View file

@ -40,8 +40,8 @@
#include "Foundation/NSObjCRuntime.h"
#include "Foundation/NSPortCoder.h"
#include "Foundation/NSUserDefaults.h"
#include "gnustep/base/preface.h"
#include "gnustep/base/GSObjCRuntime.h"
#include "GNUstepBase/preface.h"
#include "GNUstepBase/GSObjCRuntime.h"
#ifdef HAVE_SYS_TIME_H
#include <sys/time.h>
#endif

View file

@ -38,7 +38,7 @@
#include "Foundation/NSDebug.h"
#include "Foundation/NSObjCRuntime.h"
#include "Foundation/NSValue.h"
#include "gnustep/base/GSCategories.h"
#include "GNUstepBase/GSCategories.h"
#include "GSPrivate.h"
@implementation NSDictionary

View file

@ -26,8 +26,8 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "gnustep/base/DistributedObjects.h"
#include "GNUstepBase/preface.h"
#include "GNUstepBase/DistributedObjects.h"
#include "Foundation/NSLock.h"
#include "Foundation/NSPort.h"
#include "Foundation/NSMethodSignature.h"

View file

@ -25,7 +25,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSObject.h"
#include "Foundation/NSConnection.h"
#include "Foundation/NSDistantObject.h"

View file

@ -25,7 +25,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSUtilities.h"
#include "Foundation/NSArray.h"

View file

@ -24,7 +24,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSException.h"
#include "Foundation/NSString.h"
#include "Foundation/NSArray.h"

View file

@ -25,14 +25,14 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSObject.h"
#include "Foundation/NSData.h"
#include "Foundation/NSString.h"
#include "Foundation/NSFileHandle.h"
#include "Foundation/NSPathUtilities.h"
#include "Foundation/NSBundle.h"
#include "Foundation/GSFileHandle.h"
#include "GNUstepBase/GSFileHandle.h"
// GNUstep Notification names

View file

@ -38,7 +38,7 @@
#include "config.h"
#include <string.h>
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSFileManager.h"
#include "Foundation/NSException.h"
#include "Foundation/NSAutoreleasePool.h"
@ -1931,7 +1931,7 @@ inline void gsedRelease(GSEnumeratedDirectory X)
#define GSI_ARRAY_RELEASE(A, X) gsedRelease(X.ext)
#define GSI_ARRAY_RETAIN(A, X)
#include "gnustep/base/GSIArray.h"
#include "GNUstepBase/GSIArray.h"
/* Portable replacement for strdup - return a copy of original. */
inline char *custom_strdup (const char *original)

View file

@ -35,7 +35,7 @@
#include "config.h"
#include <math.h>
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSString.h"
#include "Foundation/NSGeometry.h"
#include "Foundation/NSScanner.h"

View file

@ -56,7 +56,7 @@
(M->extra.retain)((NSHashTable*)M, X.ptr)
#define GSI_MAP_ENUMERATOR NSHashEnumerator
#include "gnustep/base/GSIMap.h"
#include "GNUstepBase/GSIMap.h"
/**
* Returns an array of all the objects in the table.

View file

@ -27,7 +27,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSLock.h"
#include "Foundation/NSHost.h"
#include "Foundation/NSArray.h"

View file

@ -28,7 +28,7 @@
#include "Foundation/NSException.h"
#include "Foundation/NSCoder.h"
#include "Foundation/NSInvocation.h"
#include "gnustep/base/GSInvocation.h"
#include "GSInvocation.h"
#include "config.h"
#include <mframe.h>
#if defined(USE_LIBFFI)

View file

@ -30,7 +30,7 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSLock.h"
#include "Foundation/NSException.h"
#include "Foundation/NSDebug.h"

View file

@ -25,7 +25,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSObjCRuntime.h"
#include "Foundation/NSDate.h"
#include "Foundation/NSCalendarDate.h"

View file

@ -66,7 +66,7 @@ typedef struct {
(M->extra.v.retain)((NSMapTable*)M, X.ptr)
#define GSI_MAP_ENUMERATOR NSMapEnumerator
#include "gnustep/base/GSIMap.h"
#include "GNUstepBase/GSIMap.h"
/**** Function Implementations ****/

View file

@ -22,7 +22,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSArray.h"
#include "Foundation/NSNotification.h"
#include "Foundation/NSException.h"

View file

@ -27,7 +27,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include <mframe.h>
#include "Foundation/NSMethodSignature.h"

View file

@ -191,7 +191,7 @@ static void obsFree(Observation *o);
#define GSI_ARRAY_RELEASE(A, X) obsFree(X.ext)
#define GSI_ARRAY_RETAIN(A, X) obsRetain(X.ext)
#include "gnustep/base/GSIArray.h"
#include "GNUstepBase/GSIArray.h"
#define GSI_MAP_RETAIN_KEY(M, X)
#define GSI_MAP_RELEASE_KEY(M, X) ({if ((((gsaddr)X.obj) & 1) == 0) \
@ -206,7 +206,7 @@ static void obsFree(Observation *o);
#define GSI_MAP_VEXTRA Observation*
#define GSI_MAP_EXTRA void*
#include "gnustep/base/GSIMap.h"
#include "GNUstepBase/GSIMap.h"
/*
* An NC table is used to keep track of memory allocated to store

View file

@ -50,7 +50,7 @@
*/
#include "config.h"
#include "base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSRunLoop.h"
#include "Foundation/NSNotificationQueue.h"
#include "Foundation/NSNotification.h"

View file

@ -29,7 +29,7 @@
#include <string.h>
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSException.h"
#include "Foundation/NSString.h"
#include "Foundation/NSNotification.h"

View file

@ -25,7 +25,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSException.h"
#include "Foundation/NSObjCRuntime.h"
#include "Foundation/NSString.h"

View file

@ -25,7 +25,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include <stdarg.h>
#include "Foundation/NSObject.h"
#include <objc/Protocol.h>
@ -44,7 +44,7 @@
#include "Foundation/NSObjCRuntime.h"
#include "Foundation/NSMapTable.h"
#include <limits.h>
#include "gnustep/base/GSLocale.h"
#include "GNUstepBase/GSLocale.h"
#ifdef HAVE_LOCALE_H
#include <locale.h>
#endif
@ -206,7 +206,7 @@ typedef struct obj_layout *obj;
#define GSI_MAP_VTYPES GSUNION_INT
#define GSI_MAP_NOCLEAN 1
#include "gnustep/base/GSIMap.h"
#include "GNUstepBase/GSIMap.h"
static GSIMapTable_t retain_counts = {0};

View file

@ -25,7 +25,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSObjCRuntime.h"
#include "Foundation/NSZone.h"
#include <string.h>

View file

@ -24,7 +24,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSObject.h"
#include "Foundation/NSFileHandle.h"
#include "Foundation/NSDebug.h"

View file

@ -57,7 +57,7 @@
#define GSI_MAP_EQUAL(M, X,Y) ((X).uint == (Y).uint)
#define GSI_MAP_NOCLEAN 1
#include "gnustep/base/GSIMap.h"
#include "GNUstepBase/GSIMap.h"
/*
* Setup for inline operation of arrays.
@ -66,7 +66,7 @@
#define GSI_ARRAY_RELEASE(A, X)
#define GSI_ARRAY_TYPES GSUNION_OBJ|GSUNION_SEL|GSUNION_PTR
#include "gnustep/base/GSIArray.h"
#include "GNUstepBase/GSIArray.h"
@ -74,7 +74,7 @@
#include "Foundation/NSPortCoder.h"
#undef _IN_PORT_CODER_M
#include "gnustep/base/DistributedObjects.h"
#include "GNUstepBase/DistributedObjects.h"
typedef unsigned char uchar;

View file

@ -54,7 +54,7 @@
*************************************************************************/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
@ -90,7 +90,7 @@
#include "Foundation/NSAutoreleasePool.h"
#include "Foundation/NSHost.h"
#include "Foundation/NSLock.h"
#include "gnustep/base/GSCategories.h"
#include "GNUstepBase/GSCategories.h"
#include "GSPrivate.h"

View file

@ -25,7 +25,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSProtocolChecker.h"
#include "Foundation/NSException.h"
#include "Foundation/NSInvocation.h"

View file

@ -25,7 +25,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSInvocation.h"
#include "Foundation/NSProxy.h"
#include "Foundation/NSMethodSignature.h"

View file

@ -29,7 +29,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSMapTable.h"
#include "Foundation/NSDate.h"
#include "Foundation/NSValue.h"
@ -329,7 +329,7 @@ static inline BOOL timerInvalidated(NSTimer* timer)
#define GSI_ARRAY_RETAIN(A, X)
#endif
#include "gnustep/base/GSIArray.h"
#include "GNUstepBase/GSIArray.h"
static NSComparisonResult aSort(GSIArrayItem i0, GSIArrayItem i1)
{

View file

@ -27,7 +27,7 @@
*/
#include "config.h"
#include "gnustep/base/Unicode.h"
#include "GNUstepBase/Unicode.h"
#include "Foundation/NSScanner.h"
#include "Foundation/NSException.h"
#include "Foundation/NSObjCRuntime.h"

View file

@ -25,7 +25,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSData.h"
#include "Foundation/NSDictionary.h"
#include "Foundation/NSArray.h"
@ -61,7 +61,7 @@
#define GSI_MAP_EQUAL(M, X,Y) [(X).obj isEqualToString: (Y).obj]
#define GSI_MAP_NOCLEAN 1
#include "gnustep/base/GSIMap.h"
#include "GNUstepBase/GSIMap.h"
/*
* Setup for inline operation of string arrays.
@ -70,7 +70,7 @@
#define GSI_ARRAY_RELEASE(A, X)
#define GSI_ARRAY_TYPES GSUNION_OBJ
#include "gnustep/base/GSIArray.h"
#include "GNUstepBase/GSIArray.h"
/*
* Define constants for data types and variables to hold them.

View file

@ -33,7 +33,7 @@
#include "Foundation/NSException.h"
#include "Foundation/NSObjCRuntime.h"
#include "Foundation/NSDebug.h"
#include "gnustep/base/GSCategories.h"
#include "GNUstepBase/GSCategories.h"
@class GSSet;
@class GSMutableSet;

View file

@ -22,7 +22,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSArray.h"
#include "Foundation/NSNotification.h"
#include "Foundation/NSException.h"

View file

@ -45,7 +45,7 @@
#include "config.h"
#include <stdio.h>
#include <string.h>
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSString.h"
#include "Foundation/NSCalendarDate.h"
#include "Foundation/NSArray.h"
@ -65,8 +65,8 @@
#include "Foundation/NSLock.h"
#include "Foundation/NSUserDefaults.h"
#include "Foundation/NSDebug.h"
#include "gnustep/base/GSMime.h"
#include "gnustep/base/GSFormat.h"
#include "GNUstepBase/GSMime.h"
#include "GSFormat.h"
#include <limits.h>
#include <sys/stat.h>
#ifdef HAVE_UNISTD_H
@ -76,7 +76,7 @@
#include <fcntl.h>
#include <stdio.h>
#include "gnustep/base/Unicode.h"
#include "GNUstepBase/Unicode.h"
#include "GSPrivate.h"
@ -4376,7 +4376,7 @@ handle_printf_atsign (FILE *stream,
#ifdef HAVE_LIBXML
#include "Foundation/GSXML.h"
#include "GNUstepBase/GSXML.h"
static int XML_ELEMENT_NODE;
#endif

View file

@ -25,7 +25,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSObject.h"
#include "Foundation/NSBundle.h"
#include "Foundation/NSCharacterSet.h"

View file

@ -31,7 +31,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif

View file

@ -49,7 +49,7 @@
FIXME?: use leap seconds? */
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include <limits.h>
#include <stdio.h>
#include <stdlib.h>
@ -75,7 +75,7 @@
#include "Foundation/NSTimeZone.h"
#include "Foundation/NSByteOrder.h"
#include "Foundation/NSDebug.h"
#include "gnustep/base/GSCategories.h"
#include "GNUstepBase/GSCategories.h"
#include "GSConfig.h"

View file

@ -38,7 +38,7 @@
#define GSI_ARRAY_RELEASE(A, X)
#define GSI_ARRAY_TYPES GSUNION_OBJ|GSUNION_SEL|GSUNION_PTR
#include "gnustep/base/GSIArray.h"
#include "GNUstepBase/GSIArray.h"
#define _IN_NSUNARCHIVER_M
#include "Foundation/NSArchiver.h"

View file

@ -25,7 +25,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSObjCRuntime.h"
#include "Foundation/NSString.h"
#include "Foundation/NSPathUtilities.h"
@ -38,7 +38,7 @@
#include "Foundation/NSValue.h"
#include "Foundation/NSLock.h"
#include "Foundation/NSUserDefaults.h"
#include "gnustep/base/GSCategories.h"
#include "GNUstepBase/GSCategories.h"
#include "GSPrivate.h"

View file

@ -27,7 +27,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include <sys/stat.h>
#include <sys/types.h>
#include <errno.h>
@ -52,7 +52,7 @@
#include "Foundation/NSUtilities.h"
#include "Foundation/NSValue.h"
#include "Foundation/NSDebug.h"
#include "gnustep/base/GSLocale.h"
#include "GNUstepBase/GSLocale.h"
#ifdef HAVE_LOCALE_H
#include <locale.h>
#endif

View file

@ -27,7 +27,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSValue.h"
#include "Foundation/NSCoder.h"
#include "Foundation/NSDictionary.h"

View file

@ -86,7 +86,7 @@
#define IN_NSZONE_M 1
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include <stddef.h>
#include <string.h>
#include "Foundation/NSObjCRuntime.h"

View file

@ -24,7 +24,7 @@
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSObject.h"
#include "Foundation/NSData.h"
#include "Foundation/NSArray.h"

View file

@ -26,7 +26,7 @@
#define callframe_h_INCLUDE
#include "Foundation/NSMethodSignature.h"
#include "gnustep/base/DistributedObjects.h"
#include "GNUstepBase/DistributedObjects.h"
@class NSInvocation;

View file

@ -27,7 +27,7 @@
#include "callframe.h"
#include "Foundation/NSException.h"
#include "Foundation/NSData.h"
#include "gnustep/base/GSInvocation.h"
#include "GSInvocation.h"
#if defined(ALPHA) || (defined(MIPS) && (_MIPS_SIM == _ABIN32))
typedef long long smallret_t;

View file

@ -27,7 +27,7 @@
#include <ffi.h>
#include "Foundation/NSMethodSignature.h"
#include "gnustep/base/DistributedObjects.h"
#include "GNUstepBase/DistributedObjects.h"
typedef struct _cifframe_t {
ffi_cif cif;

View file

@ -27,7 +27,7 @@
#include "cifframe.h"
#include "Foundation/NSException.h"
#include "Foundation/NSData.h"
#include "gnustep/base/GSInvocation.h"
#include "GSInvocation.h"
#if defined(ALPHA) || (defined(MIPS) && (_MIPS_SIM == _ABIN32))
typedef long long smallret_t;

View file

@ -22,7 +22,7 @@
*/
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include "Foundation/NSObjCRuntime.h"
#include "Foundation/NSString.h"

View file

@ -32,7 +32,7 @@
//#define inline
#include "config.h"
#include "gnustep/base/preface.h"
#include "GNUstepBase/preface.h"
#include <mframe.h>
#include "Foundation/NSObjCRuntime.h"
#include "Foundation/NSData.h"

View file

@ -24,12 +24,12 @@
#ifndef __mframe_h_GNUSTEP_BASE_INCLUDE
#define __mframe_h_GNUSTEP_BASE_INCLUDE
#include <base/preface.h>
#include "GNUstepBase/preface.h"
#include <base/DistributedObjects.h>
#include "GNUstepBase/DistributedObjects.h"
/* For NSArgumentInfo we include NSMethodSignature.h */
#include <Foundation/NSMethodSignature.h>
#include "Foundation/NSMethodSignature.h"
#if NeXT_runtime
typedef union {

Some files were not shown because too many files have changed in this diff Show more