From a639ce5fb398cc7afa9a6da102d9097a62c25faa Mon Sep 17 00:00:00 2001 From: ayers Date: Fri, 11 Jul 2003 19:04:05 +0000 Subject: [PATCH] * *.m: Include GNUstep.h if GNUSTEP is not defined for OS X. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gdl2/trunk@17191 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 4 ++++ EOAccess/EOAccessFault.m | 4 ++++ EOAccess/EOAdaptor.m | 4 ++++ EOAccess/EOAdaptorChannel.m | 4 ++++ EOAccess/EOAdaptorContext.m | 4 ++++ EOAccess/EOAdaptorOperation.m | 4 ++++ EOAccess/EOAttribute.m | 4 ++++ EOAccess/EODatabase.m | 4 ++++ EOAccess/EODatabaseChannel.m | 4 ++++ EOAccess/EODatabaseContext.m | 4 ++++ EOAccess/EODatabaseDataSource.m | 4 ++++ EOAccess/EODatabaseOperation.m | 4 ++++ EOAccess/EOEntity.m | 4 ++++ EOAccess/EOExpressionArray.m | 4 ++++ EOAccess/EOJoin.m | 4 ++++ EOAccess/EOModel.m | 4 ++++ EOAccess/EOModelGroup.m | 4 ++++ EOAccess/EORelationship.m | 4 ++++ EOAccess/EOSQLExpression.m | 4 ++++ EOAccess/EOSQLQualifier.m | 4 ++++ EOAccess/EOStoredProcedure.m | 4 ++++ EOAccess/EOUtilities.m | 4 ++++ EOAdaptors/Postgres95/Postgres95Adaptor.m | 4 ++++ EOAdaptors/Postgres95/Postgres95Channel.m | 4 ++++ EOAdaptors/Postgres95/Postgres95Context.m | 4 ++++ .../Postgres95/Postgres95SQLExpression.m | 4 ++++ EOAdaptors/Postgres95/Postgres95Values.m | 4 ++++ EOControl/EOAndQualifier.m | 4 ++++ EOControl/EOArrayDataSource.m | 4 ++++ EOControl/EOCheapArray.m | 4 ++++ EOControl/EOClassDescription.m | 4 ++++ EOControl/EODataSource.m | 5 +++++ EOControl/EODebug.m | 4 ++++ EOControl/EODetailDataSource.m | 4 ++++ EOControl/EOEditingContext.m | 4 ++++ EOControl/EOFault.m | 3 +++ EOControl/EOFaultHandler.m | 4 ++++ EOControl/EOFetchSpecification.m | 4 ++++ EOControl/EOGenericRecord.m | 4 ++++ EOControl/EOGlobalID.m | 4 ++++ EOControl/EOKeyComparisonQualifier.m | 4 ++++ EOControl/EOKeyGlobalID.m | 4 ++++ EOControl/EOKeyValueArchiver.m | 3 +++ EOControl/EOKeyValueCoding.m | 4 ++++ EOControl/EOKeyValueQualifier.m | 4 ++++ EOControl/EOMutableKnownKeyDictionary.m | 4 ++++ EOControl/EONSAddOns.m | 4 ++++ EOControl/EONotQualifier.m | 4 ++++ EOControl/EONull.m | 4 ++++ EOControl/EOObjectStore.m | 4 ++++ EOControl/EOObjectStoreCoordinator.m | 4 ++++ EOControl/EOObserver.m | 4 ++++ EOControl/EOOrQualifier.m | 4 ++++ EOControl/EOQualifier.m | 4 ++++ EOControl/EOSortOrdering.m | 4 ++++ EOControl/EOUndoManager.m | 4 ++++ EOControl/GNUmakefile | 2 +- EOControl/Makefile.preamble | 3 +-- EOModeler/EOModelExtensions.m | 4 ++++ EOModeler/Makefile.preamble | 3 +-- Tools/EOAttribute+GSDoc.m | 12 ++++++++++- Tools/EOEntity+GSDoc.m | 12 ++++++++++- Tools/EOJoin+GSDoc.m | 12 ++++++++++- Tools/EOModel+GSDoc.m | 16 ++++++++++++--- Tools/EORelationship+GSDoc.m | 12 ++++++++++- Tools/NSArray+GSDoc.m | 10 +++++++++- Tools/NSDictionary+GSDoc.m | 12 ++++++++++- Tools/eoutil.m | 20 +++++++++++++++++++ Tools/gsdoc-model.m | 18 +++++++++++++++++ 69 files changed, 345 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 60f6722..02c5179 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-07-11 David Ayers + + * *.m: Include GNUstep.h if GNUSTEP is not defined for OS X. + 2003-06-26 Manuel Guesdon * config.h.in: o added EMIT_TODO control diff --git a/EOAccess/EOAccessFault.m b/EOAccess/EOAccessFault.m index baf19a8..4f0a484 100644 --- a/EOAccess/EOAccessFault.m +++ b/EOAccess/EOAccessFault.m @@ -43,6 +43,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAccess/EOAdaptor.m b/EOAccess/EOAdaptor.m index ceb371c..2882a2e 100644 --- a/EOAccess/EOAdaptor.m +++ b/EOAccess/EOAdaptor.m @@ -63,6 +63,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include diff --git a/EOAccess/EOAdaptorChannel.m b/EOAccess/EOAdaptorChannel.m index 9376ba2..bbe5be5 100644 --- a/EOAccess/EOAdaptorChannel.m +++ b/EOAccess/EOAdaptorChannel.m @@ -48,6 +48,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAccess/EOAdaptorContext.m b/EOAccess/EOAdaptorContext.m index 6ac671a..a8ec70f 100644 --- a/EOAccess/EOAdaptorContext.m +++ b/EOAccess/EOAdaptorContext.m @@ -46,6 +46,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOAccess/EOAdaptorOperation.m b/EOAccess/EOAdaptorOperation.m index 1744be1..797e2cb 100644 --- a/EOAccess/EOAdaptorOperation.m +++ b/EOAccess/EOAdaptorOperation.m @@ -42,6 +42,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAccess/EOAttribute.m b/EOAccess/EOAttribute.m index 0ee0e92..7364d7f 100644 --- a/EOAccess/EOAttribute.m +++ b/EOAccess/EOAttribute.m @@ -57,6 +57,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAccess/EODatabase.m b/EOAccess/EODatabase.m index d3cc154..82ff223 100644 --- a/EOAccess/EODatabase.m +++ b/EOAccess/EODatabase.m @@ -49,6 +49,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAccess/EODatabaseChannel.m b/EOAccess/EODatabaseChannel.m index b6c727c..4b5d3bd 100644 --- a/EOAccess/EODatabaseChannel.m +++ b/EOAccess/EODatabaseChannel.m @@ -51,6 +51,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAccess/EODatabaseContext.m b/EOAccess/EODatabaseContext.m index 4e63108..3b130a5 100644 --- a/EOAccess/EODatabaseContext.m +++ b/EOAccess/EODatabaseContext.m @@ -55,6 +55,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOAccess/EODatabaseDataSource.m b/EOAccess/EODatabaseDataSource.m index 297fdba..24fd089 100644 --- a/EOAccess/EODatabaseDataSource.m +++ b/EOAccess/EODatabaseDataSource.m @@ -52,6 +52,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAccess/EODatabaseOperation.m b/EOAccess/EODatabaseOperation.m index 3d81b34..db98c8b 100644 --- a/EOAccess/EODatabaseOperation.m +++ b/EOAccess/EODatabaseOperation.m @@ -46,6 +46,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOAccess/EOEntity.m b/EOAccess/EOEntity.m index 97947a9..51bcfe3 100644 --- a/EOAccess/EOEntity.m +++ b/EOAccess/EOEntity.m @@ -60,6 +60,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAccess/EOExpressionArray.m b/EOAccess/EOExpressionArray.m index 4cddeda..c0bc405 100644 --- a/EOAccess/EOExpressionArray.m +++ b/EOAccess/EOExpressionArray.m @@ -51,6 +51,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOAccess/EOJoin.m b/EOAccess/EOJoin.m index 456c6dc..26718ec 100644 --- a/EOAccess/EOJoin.m +++ b/EOAccess/EOJoin.m @@ -43,6 +43,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOAccess/EOModel.m b/EOAccess/EOModel.m index 369853c..a6bc03f 100644 --- a/EOAccess/EOModel.m +++ b/EOAccess/EOModel.m @@ -51,6 +51,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOAccess/EOModelGroup.m b/EOAccess/EOModelGroup.m index cfce8bd..2a11650 100644 --- a/EOAccess/EOModelGroup.m +++ b/EOAccess/EOModelGroup.m @@ -45,6 +45,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAccess/EORelationship.m b/EOAccess/EORelationship.m index 0f920a0..be5be17 100644 --- a/EOAccess/EORelationship.m +++ b/EOAccess/EORelationship.m @@ -47,6 +47,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAccess/EOSQLExpression.m b/EOAccess/EOSQLExpression.m index 6273d5c..7a12d9b 100644 --- a/EOAccess/EOSQLExpression.m +++ b/EOAccess/EOSQLExpression.m @@ -49,6 +49,10 @@ RCS_ID("$Id$") #include #else #include +#endif + +#ifndef GNUSTEP +#include #include #endif diff --git a/EOAccess/EOSQLQualifier.m b/EOAccess/EOSQLQualifier.m index 839ada1..86bae17 100644 --- a/EOAccess/EOSQLQualifier.m +++ b/EOAccess/EOSQLQualifier.m @@ -48,6 +48,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAccess/EOStoredProcedure.m b/EOAccess/EOStoredProcedure.m index 11e433c..b68ae65 100644 --- a/EOAccess/EOStoredProcedure.m +++ b/EOAccess/EOStoredProcedure.m @@ -43,6 +43,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOAccess/EOUtilities.m b/EOAccess/EOUtilities.m index d54cf08..a17b241 100644 --- a/EOAccess/EOUtilities.m +++ b/EOAccess/EOUtilities.m @@ -47,6 +47,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAdaptors/Postgres95/Postgres95Adaptor.m b/EOAdaptors/Postgres95/Postgres95Adaptor.m index a317116..3b0f4a4 100644 --- a/EOAdaptors/Postgres95/Postgres95Adaptor.m +++ b/EOAdaptors/Postgres95/Postgres95Adaptor.m @@ -56,6 +56,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOAdaptors/Postgres95/Postgres95Channel.m b/EOAdaptors/Postgres95/Postgres95Channel.m index 6f1e8d4..086074f 100644 --- a/EOAdaptors/Postgres95/Postgres95Channel.m +++ b/EOAdaptors/Postgres95/Postgres95Channel.m @@ -54,6 +54,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAdaptors/Postgres95/Postgres95Context.m b/EOAdaptors/Postgres95/Postgres95Context.m index 2544c86..12bfb5c 100644 --- a/EOAdaptors/Postgres95/Postgres95Context.m +++ b/EOAdaptors/Postgres95/Postgres95Context.m @@ -51,6 +51,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOAdaptors/Postgres95/Postgres95SQLExpression.m b/EOAdaptors/Postgres95/Postgres95SQLExpression.m index b844d4d..bab2d4f 100644 --- a/EOAdaptors/Postgres95/Postgres95SQLExpression.m +++ b/EOAdaptors/Postgres95/Postgres95SQLExpression.m @@ -43,6 +43,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOAdaptors/Postgres95/Postgres95Values.m b/EOAdaptors/Postgres95/Postgres95Values.m index a2e7f87..d3d2c01 100644 --- a/EOAdaptors/Postgres95/Postgres95Values.m +++ b/EOAdaptors/Postgres95/Postgres95Values.m @@ -48,6 +48,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include diff --git a/EOControl/EOAndQualifier.m b/EOControl/EOAndQualifier.m index 669dc0b..b36ab8b 100644 --- a/EOControl/EOAndQualifier.m +++ b/EOControl/EOAndQualifier.m @@ -45,6 +45,10 @@ RCS_ID("$Id$") #include #else #include +#endif + +#ifndef GNUSTEP +#include #include #endif diff --git a/EOControl/EOArrayDataSource.m b/EOControl/EOArrayDataSource.m index 822b3b3..329971e 100644 --- a/EOControl/EOArrayDataSource.m +++ b/EOControl/EOArrayDataSource.m @@ -33,6 +33,10 @@ #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOControl/EOCheapArray.m b/EOControl/EOCheapArray.m index 7717e2e..4dcf674 100644 --- a/EOControl/EOCheapArray.m +++ b/EOControl/EOCheapArray.m @@ -45,6 +45,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOControl/EOClassDescription.m b/EOControl/EOClassDescription.m index faee1f2..e45f4f4 100644 --- a/EOControl/EOClassDescription.m +++ b/EOControl/EOClassDescription.m @@ -54,6 +54,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOControl/EODataSource.m b/EOControl/EODataSource.m index 4949d39..2aeb51c 100644 --- a/EOControl/EODataSource.m +++ b/EOControl/EODataSource.m @@ -35,6 +35,11 @@ RCS_ID("$Id$") + +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOControl/EODebug.m b/EOControl/EODebug.m index 2639ea9..35986e6 100644 --- a/EOControl/EODebug.m +++ b/EOControl/EODebug.m @@ -41,6 +41,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOControl/EODetailDataSource.m b/EOControl/EODetailDataSource.m index 3972ca3..d3ead7c 100644 --- a/EOControl/EODetailDataSource.m +++ b/EOControl/EODetailDataSource.m @@ -45,6 +45,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOControl/EOEditingContext.m b/EOControl/EOEditingContext.m index 4910745..16d373a 100644 --- a/EOControl/EOEditingContext.m +++ b/EOControl/EOEditingContext.m @@ -37,6 +37,10 @@ RCS_ID("$Id$") //TODO EOMultiReaderLocks #include +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOControl/EOFault.m b/EOControl/EOFault.m index a4a7be5..fe55ee4 100644 --- a/EOControl/EOFault.m +++ b/EOControl/EOFault.m @@ -54,7 +54,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include #include +#endif #include #include diff --git a/EOControl/EOFaultHandler.m b/EOControl/EOFaultHandler.m index f6c3acc..86c09df 100644 --- a/EOControl/EOFaultHandler.m +++ b/EOControl/EOFaultHandler.m @@ -48,6 +48,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOControl/EOFetchSpecification.m b/EOControl/EOFetchSpecification.m index 0e63fd9..6e01d3e 100644 --- a/EOControl/EOFetchSpecification.m +++ b/EOControl/EOFetchSpecification.m @@ -44,6 +44,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOControl/EOGenericRecord.m b/EOControl/EOGenericRecord.m index 7ae5fed..348a7ee 100644 --- a/EOControl/EOGenericRecord.m +++ b/EOControl/EOGenericRecord.m @@ -51,6 +51,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOControl/EOGlobalID.m b/EOControl/EOGlobalID.m index ab178e1..e5d3ba3 100644 --- a/EOControl/EOGlobalID.m +++ b/EOControl/EOGlobalID.m @@ -42,6 +42,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOControl/EOKeyComparisonQualifier.m b/EOControl/EOKeyComparisonQualifier.m index 7fe02da..3010a8d 100644 --- a/EOControl/EOKeyComparisonQualifier.m +++ b/EOControl/EOKeyComparisonQualifier.m @@ -44,6 +44,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOControl/EOKeyGlobalID.m b/EOControl/EOKeyGlobalID.m index 6ca9bbd..ff08ba3 100644 --- a/EOControl/EOKeyGlobalID.m +++ b/EOControl/EOKeyGlobalID.m @@ -44,6 +44,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOControl/EOKeyValueArchiver.m b/EOControl/EOKeyValueArchiver.m index a31a8b4..5405816 100644 --- a/EOControl/EOKeyValueArchiver.m +++ b/EOControl/EOKeyValueArchiver.m @@ -45,6 +45,9 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif #include #include diff --git a/EOControl/EOKeyValueCoding.m b/EOControl/EOKeyValueCoding.m index b175401..ab73ad8 100644 --- a/EOControl/EOKeyValueCoding.m +++ b/EOControl/EOKeyValueCoding.m @@ -56,6 +56,10 @@ RCS_ID("$Id$") #include #else #include +#endif + +#ifndef GNUSTEP +#include #include #endif diff --git a/EOControl/EOKeyValueQualifier.m b/EOControl/EOKeyValueQualifier.m index 3465463..9cd1de4 100644 --- a/EOControl/EOKeyValueQualifier.m +++ b/EOControl/EOKeyValueQualifier.m @@ -46,6 +46,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOControl/EOMutableKnownKeyDictionary.m b/EOControl/EOMutableKnownKeyDictionary.m index 6fc1b05..aee270a 100644 --- a/EOControl/EOMutableKnownKeyDictionary.m +++ b/EOControl/EOMutableKnownKeyDictionary.m @@ -47,6 +47,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOControl/EONSAddOns.m b/EOControl/EONSAddOns.m index d35f4f5..1aa12d2 100644 --- a/EOControl/EONSAddOns.m +++ b/EOControl/EONSAddOns.m @@ -50,6 +50,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOControl/EONotQualifier.m b/EOControl/EONotQualifier.m index 2ff4937..0ca8297 100644 --- a/EOControl/EONotQualifier.m +++ b/EOControl/EONotQualifier.m @@ -43,6 +43,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include diff --git a/EOControl/EONull.m b/EOControl/EONull.m index 64b0aa4..3c2d24b 100644 --- a/EOControl/EONull.m +++ b/EOControl/EONull.m @@ -47,6 +47,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOControl/EOObjectStore.m b/EOControl/EOObjectStore.m index 636bb7d..ec604c3 100644 --- a/EOControl/EOObjectStore.m +++ b/EOControl/EOObjectStore.m @@ -41,6 +41,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include diff --git a/EOControl/EOObjectStoreCoordinator.m b/EOControl/EOObjectStoreCoordinator.m index 3084a8b..4c0c56a 100644 --- a/EOControl/EOObjectStoreCoordinator.m +++ b/EOControl/EOObjectStoreCoordinator.m @@ -46,6 +46,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOControl/EOObserver.m b/EOControl/EOObserver.m index 4d90134..c112d7d 100644 --- a/EOControl/EOObserver.m +++ b/EOControl/EOObserver.m @@ -46,6 +46,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOControl/EOOrQualifier.m b/EOControl/EOOrQualifier.m index 7ed0bff..6410e50 100644 --- a/EOControl/EOOrQualifier.m +++ b/EOControl/EOOrQualifier.m @@ -43,6 +43,10 @@ RCS_ID("$Id$") #include #else #include +#endif + +#ifndef GNUSTEP +#include #include #endif diff --git a/EOControl/EOQualifier.m b/EOControl/EOQualifier.m index 4245a2f..ddfaa33 100644 --- a/EOControl/EOQualifier.m +++ b/EOControl/EOQualifier.m @@ -50,6 +50,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOControl/EOSortOrdering.m b/EOControl/EOSortOrdering.m index 92438f3..c48a589 100644 --- a/EOControl/EOSortOrdering.m +++ b/EOControl/EOSortOrdering.m @@ -44,6 +44,10 @@ RCS_ID("$Id$") #include #endif +#ifndef GNUSTEP +#include +#endif + #include #include #include diff --git a/EOControl/EOUndoManager.m b/EOControl/EOUndoManager.m index 95d6078..0424467 100644 --- a/EOControl/EOUndoManager.m +++ b/EOControl/EOUndoManager.m @@ -35,6 +35,10 @@ RCS_ID("$Id$") +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOControl/GNUmakefile b/EOControl/GNUmakefile index efcae85..4dcf687 100644 --- a/EOControl/GNUmakefile +++ b/EOControl/GNUmakefile @@ -1,5 +1,5 @@ # -# eoaccess makefile for GNUstep Database Library. +# EOControl makefile for GNUstep Database Library. # # Copyright (C) 1997 Free Software Foundation, Inc. # diff --git a/EOControl/Makefile.preamble b/EOControl/Makefile.preamble index f9b51b0..87e3095 100644 --- a/EOControl/Makefile.preamble +++ b/EOControl/Makefile.preamble @@ -58,8 +58,7 @@ ADDITIONAL_LIB_DIRS = # # Additional directories to be created during installation -ADDITIONAL_INSTALL_DIRS = \ - $(GNUSTEP_HEADERS)/$(GNUSTEP_FND_DIR)/eoaccess/exceptions +ADDITIONAL_INSTALL_DIRS = # What are the libraries this library depends upon. This is needed for some diff --git a/EOModeler/EOModelExtensions.m b/EOModeler/EOModelExtensions.m index b489032..1b7e6ed 100644 --- a/EOModeler/EOModelExtensions.m +++ b/EOModeler/EOModelExtensions.m @@ -26,6 +26,10 @@ #include "config.h" +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/EOModeler/Makefile.preamble b/EOModeler/Makefile.preamble index 11b5304..d94432c 100644 --- a/EOModeler/Makefile.preamble +++ b/EOModeler/Makefile.preamble @@ -58,8 +58,7 @@ ADDITIONAL_LIB_DIRS = # # Additional directories to be created during installation -ADDITIONAL_INSTALL_DIRS = \ - $(GNUSTEP_HEADERS)/$(GNUSTEP_FND_DIR)/eoaccess/exceptions +ADDITIONAL_INSTALL_DIRS = # What are the libraries this library depends upon. This is needed for some diff --git a/Tools/EOAttribute+GSDoc.m b/Tools/EOAttribute+GSDoc.m index ef2f301..2b9462e 100644 --- a/Tools/EOAttribute+GSDoc.m +++ b/Tools/EOAttribute+GSDoc.m @@ -35,10 +35,20 @@ RCS_ID("$Id$") +#ifndef NeXT_Foundation_LIBRARY +#include +#else +#include +#endif + +#ifndef GNUSTEP +#include +#endif + #include #include #include -#include + #include "NSArray+GSDoc.h" #include "NSDictionary+GSDoc.h" #include "EOAttribute+GSDoc.h" diff --git a/Tools/EOEntity+GSDoc.m b/Tools/EOEntity+GSDoc.m index bb7a492..f081bfc 100644 --- a/Tools/EOEntity+GSDoc.m +++ b/Tools/EOEntity+GSDoc.m @@ -35,9 +35,19 @@ RCS_ID("$Id$") +#ifndef NeXT_Foundation_LIBRARY +#include +#else +#include +#endif + +#ifndef GNUSTEP +#include +#endif + #include #include -#include + #include "NSArray+GSDoc.h" #include "NSDictionary+GSDoc.h" #include "EOModel+GSDoc.h" diff --git a/Tools/EOJoin+GSDoc.m b/Tools/EOJoin+GSDoc.m index f119892..be4df44 100644 --- a/Tools/EOJoin+GSDoc.m +++ b/Tools/EOJoin+GSDoc.m @@ -35,10 +35,20 @@ RCS_ID("$Id$") +#ifndef NeXT_Foundation_LIBRARY +#include +#else +#include +#endif + +#ifndef GNUSTEP +#include +#endif + #include #include #include -#include + #include "NSArray+GSDoc.h" #include "NSDictionary+GSDoc.h" #include "EOAttribute+GSDoc.h" diff --git a/Tools/EOModel+GSDoc.m b/Tools/EOModel+GSDoc.m index fec4de0..5753dc3 100644 --- a/Tools/EOModel+GSDoc.m +++ b/Tools/EOModel+GSDoc.m @@ -34,12 +34,22 @@ RCS_ID("$Id$") +#ifndef NeXT_Foundation_LIBRARY +#include +#include +#else +#include +#endif + + +#ifndef GNUSTEP +#include +#endif + #include #include #include -#include -#include -#include + #include "NSArray+GSDoc.h" #include "NSDictionary+GSDoc.h" #include "EOEntity+GSDoc.h" diff --git a/Tools/EORelationship+GSDoc.m b/Tools/EORelationship+GSDoc.m index 8a40ba2..0a78009 100644 --- a/Tools/EORelationship+GSDoc.m +++ b/Tools/EORelationship+GSDoc.m @@ -34,10 +34,20 @@ RCS_ID("$Id$") +#ifndef NeXT_Foundation_LIBRARY +#include +#else +#include +#endif + +#ifndef GNUSTEP +#include +#endif + #include #include #include -#include + #include "NSArray+GSDoc.h" #include "NSDictionary+GSDoc.h" #include "EORelationship+GSDoc.h" diff --git a/Tools/NSArray+GSDoc.m b/Tools/NSArray+GSDoc.m index d149330..262b5bd 100644 --- a/Tools/NSArray+GSDoc.m +++ b/Tools/NSArray+GSDoc.m @@ -34,8 +34,16 @@ RCS_ID("$Id$") -#include +#ifndef NeXT_Foundation_LIBRARY #include +#else +#include +#endif + +#ifndef GNUSTEP +#include +#endif + #include "NSArray+GSDoc.h" diff --git a/Tools/NSDictionary+GSDoc.m b/Tools/NSDictionary+GSDoc.m index 917efb9..564f828 100644 --- a/Tools/NSDictionary+GSDoc.m +++ b/Tools/NSDictionary+GSDoc.m @@ -34,8 +34,18 @@ RCS_ID("$Id$") -#include +#ifndef NeXT_Foundation_LIBRARY +#include +#include #include +#else +#include +#endif + +#ifndef GNUSTEP +#include +#endif + #include "NSDictionary+GSDoc.h" diff --git a/Tools/eoutil.m b/Tools/eoutil.m index 5675db7..328f7ee 100644 --- a/Tools/eoutil.m +++ b/Tools/eoutil.m @@ -35,7 +35,27 @@ RCS_ID("$Id$") +#ifndef NeXT_Foundation_LIBRARY +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#else #include +#endif + +#ifndef GNUSTEP +#include +#endif + #include #include diff --git a/Tools/gsdoc-model.m b/Tools/gsdoc-model.m index 3bf44c3..2b38bdf 100644 --- a/Tools/gsdoc-model.m +++ b/Tools/gsdoc-model.m @@ -34,8 +34,26 @@ RCS_ID("$Id$") +#ifndef NeXT_Foundation_LIBRARY +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#else #include +#endif + +#ifndef GNUSTEP +#include #include +#endif + #include #include "EOModel+GSDoc.h"