bug-gnustep
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Pending/gdl2] include GNUstep.h


From: David Ayers
Subject: [Pending/gdl2] include GNUstep.h
Date: Fri, 11 Jul 2003 20:06:55 +0200
User-agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.4b) Gecko/20030507

Hi,

This patch depends on:
http://mail.gnu.org/archive/html/bug-gnustep/2003-07/msg00107.html

and follows up on:
http://mail.gnu.org/archive/html/discuss-gnustep/2003-07/msg00070.html

for gdl2.  Will commit if/once the -base part is approved/committed.

Cheers,
David

? config.h
? config.log
? config.status
? gdl2.make
? gdl2.patch
? EOAccess/shared_debug_obj
? EOAdaptors/GNUmakefile
? EOAdaptors/Postgres95/GNUmakefile
? EOAdaptors/Postgres95/Makefile.preamble
? EOAdaptors/Postgres95/Postgres95EOAdaptor.framework
? EOAdaptors/Postgres95/derived_src
? EOAdaptors/Postgres95/shared_debug_obj
? EOControl/shared_debug_obj
? EOModeler/shared_debug_obj
? Tools/shared_debug_obj
Index: EOAccess/EOAccessFault.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOAccessFault.m,v
retrieving revision 1.8
diff -u -r1.8 EOAccessFault.m
--- EOAccess/EOAccessFault.m    26 Jun 2003 08:20:30 -0000      1.8
+++ EOAccess/EOAccessFault.m    11 Jul 2003 17:57:44 -0000
@@ -43,6 +43,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOCheapArray.h>
 #include <EOControl/EOKeyGlobalID.h>
 #include <EOControl/EODebug.h>
Index: EOAccess/EOAdaptor.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOAdaptor.m,v
retrieving revision 1.10
diff -u -r1.10 EOAdaptor.m
--- EOAccess/EOAdaptor.m        18 Apr 2003 19:01:05 -0000      1.10
+++ EOAccess/EOAdaptor.m        11 Jul 2003 17:57:44 -0000
@@ -63,6 +63,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/Unicode.h>
 
 
Index: EOAccess/EOAdaptorChannel.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOAdaptorChannel.m,v
retrieving revision 1.8
diff -u -r1.8 EOAdaptorChannel.m
--- EOAccess/EOAdaptorChannel.m 31 Mar 2003 00:24:14 -0000      1.8
+++ EOAccess/EOAdaptorChannel.m 11 Jul 2003 17:57:44 -0000
@@ -48,6 +48,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOMutableKnownKeyDictionary.h>
 #include <EOControl/EOFetchSpecification.h>
 #include <EOControl/EONSAddOns.h>
Index: EOAccess/EOAdaptorContext.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOAdaptorContext.m,v
retrieving revision 1.5
diff -u -r1.5 EOAdaptorContext.m
--- EOAccess/EOAdaptorContext.m 31 Mar 2003 00:24:14 -0000      1.5
+++ EOAccess/EOAdaptorContext.m 11 Jul 2003 17:57:44 -0000
@@ -46,6 +46,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODebug.h>
 
 #include <EOAccess/EOAdaptor.h>
Index: EOAccess/EOAdaptorOperation.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOAdaptorOperation.m,v
retrieving revision 1.6
diff -u -r1.6 EOAdaptorOperation.m
--- EOAccess/EOAdaptorOperation.m       31 Mar 2003 00:24:14 -0000      1.6
+++ EOAccess/EOAdaptorOperation.m       11 Jul 2003 17:57:44 -0000
@@ -42,6 +42,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EODatabaseOperation.h>
 #include <EOAccess/EOAttribute.h>
 #include <EOAccess/EOEntity.h>
Index: EOAccess/EOAttribute.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOAttribute.m,v
retrieving revision 1.10
diff -u -r1.10 EOAttribute.m
--- EOAccess/EOAttribute.m      16 May 2003 20:21:56 -0000      1.10
+++ EOAccess/EOAttribute.m      11 Jul 2003 17:57:45 -0000
@@ -57,6 +57,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EONull.h>
 #include <EOControl/EOObserver.h>
 #include <EOControl/EODebug.h>
Index: EOAccess/EODatabase.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EODatabase.m,v
retrieving revision 1.7
diff -u -r1.7 EODatabase.m
--- EOAccess/EODatabase.m       31 Mar 2003 00:24:14 -0000      1.7
+++ EOAccess/EODatabase.m       11 Jul 2003 17:57:45 -0000
@@ -49,6 +49,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOObjectStore.h>
 #include <EOControl/EOKeyGlobalID.h>
 #include <EOControl/EONull.h>
Index: EOAccess/EODatabaseChannel.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EODatabaseChannel.m,v
retrieving revision 1.7
diff -u -r1.7 EODatabaseChannel.m
--- EOAccess/EODatabaseChannel.m        31 Mar 2003 00:24:14 -0000      1.7
+++ EOAccess/EODatabaseChannel.m        11 Jul 2003 17:57:45 -0000
@@ -51,6 +51,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOEditingContext.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EOFetchSpecification.h>
Index: EOAccess/EODatabaseContext.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EODatabaseContext.m,v
retrieving revision 1.20
diff -u -r1.20 EODatabaseContext.m
--- EOAccess/EODatabaseContext.m        26 Jun 2003 08:20:30 -0000      1.20
+++ EOAccess/EODatabaseContext.m        11 Jul 2003 17:57:46 -0000
@@ -55,6 +55,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/GSObjCRuntime.h>
 
 #include <EOControl/EOFault.h>
Index: EOAccess/EODatabaseDataSource.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EODatabaseDataSource.m,v
retrieving revision 1.7
diff -u -r1.7 EODatabaseDataSource.m
--- EOAccess/EODatabaseDataSource.m     14 May 2003 21:33:01 -0000      1.7
+++ EOAccess/EODatabaseDataSource.m     11 Jul 2003 17:57:47 -0000
@@ -52,6 +52,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOEditingContext.h>
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EOFetchSpecification.h>
Index: EOAccess/EODatabaseOperation.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EODatabaseOperation.m,v
retrieving revision 1.8
diff -u -r1.8 EODatabaseOperation.m
--- EOAccess/EODatabaseOperation.m      31 Mar 2003 00:24:14 -0000      1.8
+++ EOAccess/EODatabaseOperation.m      11 Jul 2003 17:57:47 -0000
@@ -46,6 +46,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODebug.h>
 
 #include <EOAccess/EODatabaseOperation.h>
Index: EOAccess/EOEntity.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOEntity.m,v
retrieving revision 1.19
diff -u -r1.19 EOEntity.m
--- EOAccess/EOEntity.m 26 Jun 2003 08:20:30 -0000      1.19
+++ EOAccess/EOEntity.m 11 Jul 2003 17:57:48 -0000
@@ -60,6 +60,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EOKeyGlobalID.h>
Index: EOAccess/EOExpressionArray.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOExpressionArray.m,v
retrieving revision 1.8
diff -u -r1.8 EOExpressionArray.m
--- EOAccess/EOExpressionArray.m        31 Mar 2003 00:24:14 -0000      1.8
+++ EOAccess/EOExpressionArray.m        11 Jul 2003 17:57:48 -0000
@@ -51,6 +51,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/GSObjCRuntime.h>
 
 #include <EOControl/EODebug.h>
Index: EOAccess/EOJoin.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOJoin.m,v
retrieving revision 1.5
diff -u -r1.5 EOJoin.m
--- EOAccess/EOJoin.m   31 Mar 2003 00:24:15 -0000      1.5
+++ EOAccess/EOJoin.m   11 Jul 2003 17:57:48 -0000
@@ -43,6 +43,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODebug.h>
 
 #include <EOAccess/EOModel.h>
Index: EOAccess/EOModel.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOModel.m,v
retrieving revision 1.12
diff -u -r1.12 EOModel.m
--- EOAccess/EOModel.m  18 Apr 2003 19:01:06 -0000      1.12
+++ EOAccess/EOModel.m  11 Jul 2003 17:57:48 -0000
@@ -51,6 +51,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/GSObjCRuntime.h>
 
 #include <EOControl/EOGenericRecord.h>
Index: EOAccess/EOModelGroup.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOModelGroup.m,v
retrieving revision 1.5
diff -u -r1.5 EOModelGroup.m
--- EOAccess/EOModelGroup.m     26 Jun 2003 08:20:30 -0000      1.5
+++ EOAccess/EOModelGroup.m     11 Jul 2003 17:57:48 -0000
@@ -45,6 +45,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOModelGroup.h>
 #include <EOAccess/EOModel.h>
 #include <EOAccess/EOEntity.h>
Index: EOAccess/EORelationship.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EORelationship.m,v
retrieving revision 1.12
diff -u -r1.12 EORelationship.m
--- EOAccess/EORelationship.m   31 Mar 2003 00:24:15 -0000      1.12
+++ EOAccess/EORelationship.m   11 Jul 2003 17:57:49 -0000
@@ -47,6 +47,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOObserver.h>
 #include <EOControl/EOMutableKnownKeyDictionary.h>
 #include <EOControl/EONSAddOns.h>
Index: EOAccess/EOSQLExpression.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOSQLExpression.m,v
retrieving revision 1.13
diff -u -r1.13 EOSQLExpression.m
--- EOAccess/EOSQLExpression.m  26 Jun 2003 08:20:30 -0000      1.13
+++ EOAccess/EOSQLExpression.m  11 Jul 2003 17:57:49 -0000
@@ -49,6 +49,10 @@
 #include <Foundation/NSDebug.h>
 #else
 #include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
 #include <gnustep/base/GSCategories.h>
 #endif
 
Index: EOAccess/EOSQLQualifier.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOSQLQualifier.m,v
retrieving revision 1.7
diff -u -r1.7 EOSQLQualifier.m
--- EOAccess/EOSQLQualifier.m   31 Mar 2003 00:24:15 -0000      1.7
+++ EOAccess/EOSQLQualifier.m   11 Jul 2003 17:57:49 -0000
@@ -48,6 +48,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOSQLQualifier.h>
 #include <EOAccess/EOAttribute.h>
 #include <EOAccess/EORelationship.h>
Index: EOAccess/EOStoredProcedure.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOStoredProcedure.m,v
retrieving revision 1.7
diff -u -r1.7 EOStoredProcedure.m
--- EOAccess/EOStoredProcedure.m        31 Mar 2003 00:24:15 -0000      1.7
+++ EOAccess/EOStoredProcedure.m        11 Jul 2003 17:57:49 -0000
@@ -43,6 +43,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/GCObject.h>
 
 #include <EOControl/EODebug.h>
Index: EOAccess/EOUtilities.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAccess/EOUtilities.m,v
retrieving revision 1.5
diff -u -r1.5 EOUtilities.m
--- EOAccess/EOUtilities.m      31 Mar 2003 00:24:15 -0000      1.5
+++ EOAccess/EOUtilities.m      11 Jul 2003 17:57:49 -0000
@@ -47,6 +47,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOKeyGlobalID.h>
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EONull.h>
Index: EOAdaptors/Postgres95/Postgres95Adaptor.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAdaptors/Postgres95/Postgres95Adaptor.m,v
retrieving revision 1.8
diff -u -r1.8 Postgres95Adaptor.m
--- EOAdaptors/Postgres95/Postgres95Adaptor.m   24 Jun 2003 16:27:01 -0000      
1.8
+++ EOAdaptors/Postgres95/Postgres95Adaptor.m   11 Jul 2003 17:57:49 -0000
@@ -56,6 +56,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EONSAddOns.h>
 #include <EOControl/EODebug.h>
 
Index: EOAdaptors/Postgres95/Postgres95Channel.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAdaptors/Postgres95/Postgres95Channel.m,v
retrieving revision 1.11
diff -u -r1.11 Postgres95Channel.m
--- EOAdaptors/Postgres95/Postgres95Channel.m   26 Jun 2003 08:20:30 -0000      
1.11
+++ EOAdaptors/Postgres95/Postgres95Channel.m   11 Jul 2003 17:57:50 -0000
@@ -54,6 +54,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EONull.h>
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EOFetchSpecification.h>
Index: EOAdaptors/Postgres95/Postgres95Context.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAdaptors/Postgres95/Postgres95Context.m,v
retrieving revision 1.4
diff -u -r1.4 Postgres95Context.m
--- EOAdaptors/Postgres95/Postgres95Context.m   31 Mar 2003 00:24:15 -0000      
1.4
+++ EOAdaptors/Postgres95/Postgres95Context.m   11 Jul 2003 17:57:50 -0000
@@ -51,6 +51,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODebug.h>
 
 #include <Postgres95EOAdaptor/Postgres95Adaptor.h>
Index: EOAdaptors/Postgres95/Postgres95SQLExpression.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAdaptors/Postgres95/Postgres95SQLExpression.m,v
retrieving revision 1.9
diff -u -r1.9 Postgres95SQLExpression.m
--- EOAdaptors/Postgres95/Postgres95SQLExpression.m     26 Jun 2003 08:20:30 
-0000      1.9
+++ EOAdaptors/Postgres95/Postgres95SQLExpression.m     11 Jul 2003 17:57:50 
-0000
@@ -43,6 +43,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EONull.h>
 #include <EOControl/EONSAddOns.h>
 #include <EOControl/EODebug.h>
Index: EOAdaptors/Postgres95/Postgres95Values.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOAdaptors/Postgres95/Postgres95Values.m,v
retrieving revision 1.8
diff -u -r1.8 Postgres95Values.m
--- EOAdaptors/Postgres95/Postgres95Values.m    26 Jun 2003 08:20:30 -0000      
1.8
+++ EOAdaptors/Postgres95/Postgres95Values.m    11 Jul 2003 17:57:50 -0000
@@ -48,6 +48,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 
 #include <EOAccess/EOAttribute.h>
 
Index: EOControl/EOAndQualifier.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOAndQualifier.m,v
retrieving revision 1.10
diff -u -r1.10 EOAndQualifier.m
--- EOControl/EOAndQualifier.m  2 May 2003 17:00:23 -0000       1.10
+++ EOControl/EOAndQualifier.m  11 Jul 2003 17:57:50 -0000
@@ -45,6 +45,10 @@
 #include <Foundation/NSDebug.h>
 #else
 #include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
 #include <gnustep/base/GSObjCRuntime.h>
 #endif
 
Index: EOControl/EOArrayDataSource.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOArrayDataSource.m,v
retrieving revision 1.1
diff -u -r1.1 EOArrayDataSource.m
--- EOControl/EOArrayDataSource.m       31 Mar 2003 00:24:15 -0000      1.1
+++ EOControl/EOArrayDataSource.m       11 Jul 2003 17:57:50 -0000
@@ -33,6 +33,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 
 #include <EOControl/EOArrayDataSource.h>
 #include <EOControl/EOClassDescription.h>
Index: EOControl/EOCheapArray.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOCheapArray.m,v
retrieving revision 1.5
diff -u -r1.5 EOCheapArray.m
--- EOControl/EOCheapArray.m    26 Jun 2003 08:20:30 -0000      1.5
+++ EOControl/EOCheapArray.m    11 Jul 2003 17:57:50 -0000
@@ -45,6 +45,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOCheapArray.h>
 #include <EOControl/EODebug.h>
 
Index: EOControl/EOClassDescription.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOClassDescription.m,v
retrieving revision 1.13
diff -u -r1.13 EOClassDescription.m
--- EOControl/EOClassDescription.m      26 Jun 2003 08:20:30 -0000      1.13
+++ EOControl/EOClassDescription.m      11 Jul 2003 17:57:51 -0000
@@ -54,6 +54,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOClassDescription.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EONull.h>
Index: EOControl/EODataSource.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EODataSource.m,v
retrieving revision 1.5
diff -u -r1.5 EODataSource.m
--- EOControl/EODataSource.m    31 Mar 2003 00:24:15 -0000      1.5
+++ EOControl/EODataSource.m    11 Jul 2003 17:57:51 -0000
@@ -35,6 +35,11 @@
 
 RCS_ID("$Id: EODataSource.m,v 1.5 2003/03/31 00:24:15 ayers Exp $")
 
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODataSource.h>
 #include <EOControl/EOClassDescription.h>
 #include <EOControl/EOEditingContext.h>
Index: EOControl/EODebug.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EODebug.m,v
retrieving revision 1.5
diff -u -r1.5 EODebug.m
--- EOControl/EODebug.m 31 Mar 2003 00:24:15 -0000      1.5
+++ EOControl/EODebug.m 11 Jul 2003 17:57:51 -0000
@@ -41,6 +41,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <unistd.h>
 
 #include <EOControl/EODebug.h>
Index: EOControl/EODetailDataSource.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EODetailDataSource.m,v
retrieving revision 1.7
diff -u -r1.7 EODetailDataSource.m
--- EOControl/EODetailDataSource.m      26 Jun 2003 08:20:30 -0000      1.7
+++ EOControl/EODetailDataSource.m      11 Jul 2003 17:57:51 -0000
@@ -45,6 +45,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODetailDataSource.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EOKeyValueArchiver.h>
Index: EOControl/EOEditingContext.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOEditingContext.m,v
retrieving revision 1.10
diff -u -r1.10 EOEditingContext.m
--- EOControl/EOEditingContext.m        26 Jun 2003 08:20:30 -0000      1.10
+++ EOControl/EOEditingContext.m        11 Jul 2003 17:57:51 -0000
@@ -37,6 +37,10 @@
 //TODO EOMultiReaderLocks 
 #include <Foundation/Foundation.h>
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOEditingContext.h>
 #include <EOControl/EOObjectStoreCoordinator.h>
 #include <EOControl/EOGlobalID.h>
Index: EOControl/EOFault.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOFault.m,v
retrieving revision 1.14
diff -u -r1.14 EOFault.m
--- EOControl/EOFault.m 22 Jun 2003 08:47:24 -0000      1.14
+++ EOControl/EOFault.m 11 Jul 2003 17:57:51 -0000
@@ -54,7 +54,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
 #include <gnustep/base/GSObjCRuntime.h>
+#endif
 
 #include <EOControl/EOFault.h>
 #include <EOControl/EOKeyGlobalID.h>
Index: EOControl/EOFaultHandler.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOFaultHandler.m,v
retrieving revision 1.7
diff -u -r1.7 EOFaultHandler.m
--- EOControl/EOFaultHandler.m  31 Mar 2003 00:24:15 -0000      1.7
+++ EOControl/EOFaultHandler.m  11 Jul 2003 17:57:51 -0000
@@ -48,6 +48,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/GCObject.h>
 
 #include <EOControl/EOFault.h>
Index: EOControl/EOFetchSpecification.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOFetchSpecification.m,v
retrieving revision 1.10
diff -u -r1.10 EOFetchSpecification.m
--- EOControl/EOFetchSpecification.m    26 Jun 2003 08:20:30 -0000      1.10
+++ EOControl/EOFetchSpecification.m    11 Jul 2003 17:57:51 -0000
@@ -44,6 +44,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOFetchSpecification.h>
 #include <EOControl/EOKeyValueArchiver.h>
 #include <EOControl/EOObserver.h>
Index: EOControl/EOGenericRecord.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOGenericRecord.m,v
retrieving revision 1.15
diff -u -r1.15 EOGenericRecord.m
--- EOControl/EOGenericRecord.m 31 Mar 2003 00:24:15 -0000      1.15
+++ EOControl/EOGenericRecord.m 11 Jul 2003 17:57:52 -0000
@@ -51,6 +51,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <gnustep/base/GSObjCRuntime.h>
 
 #include <EOControl/EOClassDescription.h>
Index: EOControl/EOGlobalID.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOGlobalID.m,v
retrieving revision 1.8
diff -u -r1.8 EOGlobalID.m
--- EOControl/EOGlobalID.m      31 Mar 2003 00:24:15 -0000      1.8
+++ EOControl/EOGlobalID.m      11 Jul 2003 17:57:52 -0000
@@ -42,6 +42,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOGlobalID.h>
 #include <EOControl/EODebug.h>
 
Index: EOControl/EOKeyComparisonQualifier.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOKeyComparisonQualifier.m,v
retrieving revision 1.9
diff -u -r1.9 EOKeyComparisonQualifier.m
--- EOControl/EOKeyComparisonQualifier.m        31 Mar 2003 00:24:15 -0000      
1.9
+++ EOControl/EOKeyComparisonQualifier.m        11 Jul 2003 17:57:52 -0000
@@ -44,6 +44,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EODebug.h>
Index: EOControl/EOKeyGlobalID.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOKeyGlobalID.m,v
retrieving revision 1.7
diff -u -r1.7 EOKeyGlobalID.m
--- EOControl/EOKeyGlobalID.m   8 May 2003 12:52:45 -0000       1.7
+++ EOControl/EOKeyGlobalID.m   11 Jul 2003 17:57:52 -0000
@@ -44,6 +44,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOKeyGlobalID.h>
 #include <EOControl/EODebug.h>
 #include <EOControl/EONull.h>
Index: EOControl/EOKeyValueArchiver.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOKeyValueArchiver.m,v
retrieving revision 1.5
diff -u -r1.5 EOKeyValueArchiver.m
--- EOControl/EOKeyValueArchiver.m      31 Mar 2003 00:24:15 -0000      1.5
+++ EOControl/EOKeyValueArchiver.m      11 Jul 2003 17:57:52 -0000
@@ -45,6 +45,9 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
 
 #include <EOControl/EOKeyValueArchiver.h>
 #include <EOControl/EODebug.h>
Index: EOControl/EOKeyValueCoding.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOKeyValueCoding.m,v
retrieving revision 1.12
diff -u -r1.12 EOKeyValueCoding.m
--- EOControl/EOKeyValueCoding.m        26 Jun 2003 08:20:30 -0000      1.12
+++ EOControl/EOKeyValueCoding.m        11 Jul 2003 17:57:52 -0000
@@ -56,6 +56,10 @@
 #include <Foundation/NSDebug.h>
 #else
 #include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
 #include <gnustep/base/GSCategories.h>
 #endif
 
Index: EOControl/EOKeyValueQualifier.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOKeyValueQualifier.m,v
retrieving revision 1.8
diff -u -r1.8 EOKeyValueQualifier.m
--- EOControl/EOKeyValueQualifier.m     31 Mar 2003 00:24:15 -0000      1.8
+++ EOControl/EOKeyValueQualifier.m     11 Jul 2003 17:57:52 -0000
@@ -46,6 +46,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EOObjectStore.h>
Index: EOControl/EOMutableKnownKeyDictionary.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOMutableKnownKeyDictionary.m,v
retrieving revision 1.7
diff -u -r1.7 EOMutableKnownKeyDictionary.m
--- EOControl/EOMutableKnownKeyDictionary.m     31 Mar 2003 00:24:15 -0000      
1.7
+++ EOControl/EOMutableKnownKeyDictionary.m     11 Jul 2003 17:57:53 -0000
@@ -47,6 +47,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOMutableKnownKeyDictionary.h>
 #include <EOControl/EODebug.h>
 #include <EOControl/EONull.h>
Index: EOControl/EONSAddOns.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EONSAddOns.m,v
retrieving revision 1.7
diff -u -r1.7 EONSAddOns.m
--- EOControl/EONSAddOns.m      24 Jun 2003 16:27:01 -0000      1.7
+++ EOControl/EONSAddOns.m      11 Jul 2003 17:57:53 -0000
@@ -50,6 +50,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EONSAddOns.h>
 #include <EOControl/EODebug.h>
 
Index: EOControl/EONotQualifier.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EONotQualifier.m,v
retrieving revision 1.7
diff -u -r1.7 EONotQualifier.m
--- EOControl/EONotQualifier.m  31 Mar 2003 00:24:15 -0000      1.7
+++ EOControl/EONotQualifier.m  11 Jul 2003 17:57:53 -0000
@@ -43,6 +43,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOQualifier.h>
 
 
Index: EOControl/EONull.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EONull.m,v
retrieving revision 1.6
diff -u -r1.6 EONull.m
--- EOControl/EONull.m  31 Mar 2003 00:24:15 -0000      1.6
+++ EOControl/EONull.m  11 Jul 2003 17:57:53 -0000
@@ -47,6 +47,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EONull.h>
 #include <EOControl/EODebug.h>
 
Index: EOControl/EOObjectStore.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOObjectStore.m,v
retrieving revision 1.4
diff -u -r1.4 EOObjectStore.m
--- EOControl/EOObjectStore.m   31 Mar 2003 00:24:15 -0000      1.4
+++ EOControl/EOObjectStore.m   11 Jul 2003 17:57:53 -0000
@@ -41,6 +41,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOObjectStore.h>
 
 
Index: EOControl/EOObjectStoreCoordinator.m
===================================================================
RCS file: 
/cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOObjectStoreCoordinator.m,v
retrieving revision 1.7
diff -u -r1.7 EOObjectStoreCoordinator.m
--- EOControl/EOObjectStoreCoordinator.m        8 May 2003 13:06:34 -0000       
1.7
+++ EOControl/EOObjectStoreCoordinator.m        11 Jul 2003 17:57:53 -0000
@@ -46,6 +46,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOObjectStoreCoordinator.h>
 #include <EOControl/EOEditingContext.h>
 #include <EOControl/EODebug.h>
Index: EOControl/EOObserver.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOObserver.m,v
retrieving revision 1.6
diff -u -r1.6 EOObserver.m
--- EOControl/EOObserver.m      31 Mar 2003 00:24:15 -0000      1.6
+++ EOControl/EOObserver.m      11 Jul 2003 17:57:53 -0000
@@ -46,6 +46,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOClassDescription.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EONull.h>
Index: EOControl/EOOrQualifier.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOOrQualifier.m,v
retrieving revision 1.9
diff -u -r1.9 EOOrQualifier.m
--- EOControl/EOOrQualifier.m   2 May 2003 17:00:23 -0000       1.9
+++ EOControl/EOOrQualifier.m   11 Jul 2003 17:57:53 -0000
@@ -43,6 +43,10 @@
 #include <Foundation/NSDebug.h>
 #else
 #include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
 #include <gnustep/base/GSObjCRuntime.h>
 #endif
 
Index: EOControl/EOQualifier.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOQualifier.m,v
retrieving revision 1.13
diff -u -r1.13 EOQualifier.m
--- EOControl/EOQualifier.m     26 Jun 2003 08:20:30 -0000      1.13
+++ EOControl/EOQualifier.m     11 Jul 2003 17:57:53 -0000
@@ -50,6 +50,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOQualifier.h>
 #include <EOControl/EODebug.h>
 
Index: EOControl/EOSortOrdering.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOSortOrdering.m,v
retrieving revision 1.8
diff -u -r1.8 EOSortOrdering.m
--- EOControl/EOSortOrdering.m  26 Jun 2003 08:20:30 -0000      1.8
+++ EOControl/EOSortOrdering.m  11 Jul 2003 17:57:53 -0000
@@ -44,6 +44,10 @@
 #include <Foundation/Foundation.h>
 #endif
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOSortOrdering.h>
 #include <EOControl/EOKeyValueCoding.h>
 #include <EOControl/EOKeyValueArchiver.h>
Index: EOControl/EOUndoManager.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/EOUndoManager.m,v
retrieving revision 1.6
diff -u -r1.6 EOUndoManager.m
--- EOControl/EOUndoManager.m   1 Apr 2003 21:40:14 -0000       1.6
+++ EOControl/EOUndoManager.m   11 Jul 2003 17:57:53 -0000
@@ -35,6 +35,10 @@
 
 RCS_ID("$Id: EOUndoManager.m,v 1.6 2003/04/01 21:40:14 ayers Exp $")
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EODeprecated.h>
 #include <EOControl/EODebug.h>
 
Index: EOControl/GNUmakefile
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/GNUmakefile,v
retrieving revision 1.6
diff -u -r1.6 GNUmakefile
--- EOControl/GNUmakefile       2 May 2003 12:23:27 -0000       1.6
+++ EOControl/GNUmakefile       11 Jul 2003 17:57:53 -0000
@@ -1,5 +1,5 @@
 #
-#  eoaccess makefile for GNUstep Database Library.
+#  EOControl makefile for GNUstep Database Library.
 #  
 #  Copyright (C) 1997 Free Software Foundation, Inc.
 #
Index: EOControl/Makefile.preamble
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOControl/Makefile.preamble,v
retrieving revision 1.1
diff -u -r1.1 Makefile.preamble
--- EOControl/Makefile.preamble 15 Nov 2002 22:57:05 -0000      1.1
+++ EOControl/Makefile.preamble 11 Jul 2003 17:57:53 -0000
@@ -58,8 +58,7 @@
 #
 
 # 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
Index: EOModeler/EOModelExtensions.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOModeler/EOModelExtensions.m,v
retrieving revision 1.4
diff -u -r1.4 EOModelExtensions.m
--- EOModeler/EOModelExtensions.m       31 Mar 2003 00:24:15 -0000      1.4
+++ EOModeler/EOModelExtensions.m       11 Jul 2003 17:57:53 -0000
@@ -26,6 +26,10 @@
 
 #include "config.h"
 
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOModeler/EOModelExtensions.h>
 #include <EOControl/EODebug.h>
 
Index: EOModeler/Makefile.preamble
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/EOModeler/Makefile.preamble,v
retrieving revision 1.1
diff -u -r1.1 Makefile.preamble
--- EOModeler/Makefile.preamble 15 Nov 2002 22:57:05 -0000      1.1
+++ EOModeler/Makefile.preamble 11 Jul 2003 17:57:53 -0000
@@ -58,8 +58,7 @@
 #
 
 # 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
Index: Tools/EOAttribute+GSDoc.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/Tools/EOAttribute+GSDoc.m,v
retrieving revision 1.3
diff -u -r1.3 EOAttribute+GSDoc.m
--- Tools/EOAttribute+GSDoc.m   31 Mar 2003 00:24:15 -0000      1.3
+++ Tools/EOAttribute+GSDoc.m   11 Jul 2003 17:57:53 -0000
@@ -35,10 +35,20 @@
 
 RCS_ID("$Id: EOAttribute+GSDoc.m,v 1.3 2003/03/31 00:24:15 ayers Exp $")
 
+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSAutoreleasePool.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOAccess.h>
 #include <EOAccess/EOEntity.h>
 #include <EOAccess/EOAttribute.h>
-#include <Foundation/NSAutoreleasePool.h>
+
 #include "NSArray+GSDoc.h"
 #include "NSDictionary+GSDoc.h"
 #include "EOAttribute+GSDoc.h"
Index: Tools/EOEntity+GSDoc.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/Tools/EOEntity+GSDoc.m,v
retrieving revision 1.2
diff -u -r1.2 EOEntity+GSDoc.m
--- Tools/EOEntity+GSDoc.m      31 Mar 2003 00:24:15 -0000      1.2
+++ Tools/EOEntity+GSDoc.m      11 Jul 2003 17:57:53 -0000
@@ -35,9 +35,19 @@
 
 RCS_ID("$Id: EOEntity+GSDoc.m,v 1.2 2003/03/31 00:24:15 ayers Exp $")
 
+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSAutoreleasePool.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOAccess.h>
 #include <EOAccess/EOEntity.h>
-#include <Foundation/NSAutoreleasePool.h>
+
 #include "NSArray+GSDoc.h"
 #include "NSDictionary+GSDoc.h"
 #include "EOModel+GSDoc.h"
Index: Tools/EOJoin+GSDoc.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/Tools/EOJoin+GSDoc.m,v
retrieving revision 1.2
diff -u -r1.2 EOJoin+GSDoc.m
--- Tools/EOJoin+GSDoc.m        31 Mar 2003 00:24:15 -0000      1.2
+++ Tools/EOJoin+GSDoc.m        11 Jul 2003 17:57:53 -0000
@@ -35,10 +35,20 @@
 
 RCS_ID("$Id: EOJoin+GSDoc.m,v 1.2 2003/03/31 00:24:15 ayers Exp $")
 
+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSAutoreleasePool.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOAccess.h>
 #include <EOAccess/EOJoin.h>
 #include <EOAccess/EORelationship.h>
-#include <Foundation/NSAutoreleasePool.h>
+
 #include "NSArray+GSDoc.h"
 #include "NSDictionary+GSDoc.h"
 #include "EOAttribute+GSDoc.h"
Index: Tools/EOModel+GSDoc.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/Tools/EOModel+GSDoc.m,v
retrieving revision 1.2
diff -u -r1.2 EOModel+GSDoc.m
--- Tools/EOModel+GSDoc.m       31 Mar 2003 00:24:15 -0000      1.2
+++ Tools/EOModel+GSDoc.m       11 Jul 2003 17:57:53 -0000
@@ -34,12 +34,22 @@
 
 RCS_ID("$Id: EOModel+GSDoc.m,v 1.2 2003/03/31 00:24:15 ayers Exp $")
 
+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSAutoreleasePool.h>
+#include <Foundation/NSDebug.h>
+#else
+#include <Foundation/Foundation>
+#endif
+
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOAccess.h>
 #include <EOAccess/EOModel.h>
 #include <EOAccess/EOEntity.h>
-#include <Foundation/Foundation.h>
-#include <Foundation/NSAutoreleasePool.h>
-#include <Foundation/NSDebug.h>
+
 #include "NSArray+GSDoc.h"
 #include "NSDictionary+GSDoc.h"
 #include "EOEntity+GSDoc.h"
Index: Tools/EORelationship+GSDoc.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/Tools/EORelationship+GSDoc.m,v
retrieving revision 1.2
diff -u -r1.2 EORelationship+GSDoc.m
--- Tools/EORelationship+GSDoc.m        31 Mar 2003 00:24:15 -0000      1.2
+++ Tools/EORelationship+GSDoc.m        11 Jul 2003 17:57:53 -0000
@@ -34,10 +34,20 @@
 
 RCS_ID("$Id: EORelationship+GSDoc.m,v 1.2 2003/03/31 00:24:15 ayers Exp $")
 
+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSAutoreleasePool.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOAccess/EOAccess.h>
 #include <EOAccess/EORelationship.h>
 #include <EOAccess/EOEntity.h>
-#include <Foundation/NSAutoreleasePool.h>
+
 #include "NSArray+GSDoc.h"
 #include "NSDictionary+GSDoc.h"
 #include "EORelationship+GSDoc.h"
Index: Tools/NSArray+GSDoc.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/Tools/NSArray+GSDoc.m,v
retrieving revision 1.2
diff -u -r1.2 NSArray+GSDoc.m
--- Tools/NSArray+GSDoc.m       31 Mar 2003 00:24:15 -0000      1.2
+++ Tools/NSArray+GSDoc.m       11 Jul 2003 17:57:53 -0000
@@ -34,8 +34,16 @@
 
 RCS_ID("$Id: NSArray+GSDoc.m,v 1.2 2003/03/31 00:24:15 ayers Exp $")
 
-#include <Foundation/Foundation.h>
+#ifndef NeXT_Foundation_LIBRARY
 #include <Foundation/NSAutoreleasePool.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include "NSArray+GSDoc.h"
 
 
Index: Tools/NSDictionary+GSDoc.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/Tools/NSDictionary+GSDoc.m,v
retrieving revision 1.2
diff -u -r1.2 NSDictionary+GSDoc.m
--- Tools/NSDictionary+GSDoc.m  31 Mar 2003 00:24:15 -0000      1.2
+++ Tools/NSDictionary+GSDoc.m  11 Jul 2003 17:57:53 -0000
@@ -34,8 +34,18 @@
 
 RCS_ID("$Id: NSDictionary+GSDoc.m,v 1.2 2003/03/31 00:24:15 ayers Exp $")
 
-#include <Foundation/Foundation.h>
+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSString.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSAutoreleasePool.h>
+#else
+#include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include "NSDictionary+GSDoc.h"
 
 
Index: Tools/eoutil.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/Tools/eoutil.m,v
retrieving revision 1.2
diff -u -r1.2 eoutil.m
--- Tools/eoutil.m      31 Mar 2003 00:24:15 -0000      1.2
+++ Tools/eoutil.m      11 Jul 2003 17:57:53 -0000
@@ -35,7 +35,27 @@
 
 RCS_ID("$Id: eoutil.m,v 1.2 2003/03/31 00:24:15 ayers Exp $")
 
+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSArray.h>
+#include <Foundation/NSString.h>
+#include <Foundation/NSDecimalNumber.h>
+#include <Foundation/NSDictionary.h>
+#include <Foundation/NSSet.h>
+#include <Foundation/NSEnumerator.h>
+#include <Foundation/NSData.h>
+#include <Foundation/NSCalendarDate.h>
+#include <Foundation/NSFileManager.h>
+#include <Foundation/NSFileHandle.h>
+#include <Foundation/NSException.h>
+#include <Foundation/NSAutoreleasePool.h>
+#else
 #include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
+#endif
+
 #include <EOControl/EOControl.h>
 #include <EOAccess/EOAccess.h>
 
Index: Tools/gsdoc-model.m
===================================================================
RCS file: /cvsroot/gnustep/gnustep/dev-libs/gdl2/Tools/gsdoc-model.m,v
retrieving revision 1.2
diff -u -r1.2 gsdoc-model.m
--- Tools/gsdoc-model.m 31 Mar 2003 00:24:15 -0000      1.2
+++ Tools/gsdoc-model.m 11 Jul 2003 17:57:53 -0000
@@ -34,8 +34,26 @@
 
 RCS_ID("$Id: gsdoc-model.m,v 1.2 2003/03/31 00:24:15 ayers Exp $")
 
+#ifndef NeXT_Foundation_LIBRARY
+#include <Foundation/NSString.h>
+#include <Foundation/NSArray.h>
+#include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
+#include <Foundation/NSFileManager.h>
+#include <Foundation/NSProcessInfo.h>
+#include <Foundation/NSSet.h>
+#include <Foundation/NSUserDefaults.h>
+#include <Foundation/NSAutoreleasePool.h>
+#include <Foundation/NSException.h>
+#else
 #include <Foundation/Foundation.h>
+#endif
+
+#ifndef GNUSTEP
+#include <gnustep/base/GNUstep.h>
 #include <gnustep/base/GSCategories.h>
+#endif
+
 #include <EOAccess/EOAccess.h>
 #include "EOModel+GSDoc.h"
 


reply via email to

[Prev in Thread] Current Thread [Next in Thread]