fixed a compilation error

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@819 e4a50df8-12e2-0310-a44c-efbce7f8a7e3

diff --git a/sope-gdl1/GDLAccess/ChangeLog b/sope-gdl1/GDLAccess/ChangeLog
index 2267cb9821993bb12cdaae9640993d126622ab20..eb7f6f0466229b4102ceb91563f2c5bb51107540 100644 (file)
--- a/sope-gdl1/GDLAccess/ChangeLog
+++ b/sope-gdl1/GDLAccess/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-02  Helge Hess  <helge.hess@skyrix.com>
+
+       * EOJoinTypes.h: properly protect header against multiple inclusion
+         (fixes a compilation issue) (v4.5.52)
+
 2005-05-05  Helge Hess  <helge.hess@opengroupware.org>
 
        * fixed gcc 4.0 warnings (v4.5.51)

diff --git a/sope-gdl1/GDLAccess/EOJoinTypes.h b/sope-gdl1/GDLAccess/EOJoinTypes.h
index 9010e78924c2314f3ed348b196da4ac6a8e99304..e405f60afeee6967d39068eccceacfe244fbf193 100644 (file)
--- a/sope-gdl1/GDLAccess/EOJoinTypes.h
+++ b/sope-gdl1/GDLAccess/EOJoinTypes.h
@@ -1,4 +1,31 @@
-// $Id: EOJoinTypes.h 1 2004-08-20 10:38:46Z znek $
+/* 
+   EOSQLExpression.m
+
+   Copyright (C) 1996 Free Software Foundation, Inc.
+
+   Author: Ovidiu Predescu <ovidiu@bx.logicnet.ro>
+   Date: September 1996
+
+   This file is part of the GNUstep Database 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; see the file COPYING.LIB.
+   If not, write to the Free Software Foundation,
+   59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+*/
+
+#ifndef __EOJoinTypes_h__
+#define __EOJoinTypes_h__
 
 typedef enum {
     EOInnerJoin = 0,
@@ -17,3 +44,5 @@ typedef enum {
 } EOJoinOperator;
 
 @class EOJoin;
+
+#endif /* __EOJoinTypes_h__ */

diff --git a/sope-gdl1/GDLAccess/EOSQLExpression.m b/sope-gdl1/GDLAccess/EOSQLExpression.m
index 9315814fbbeef714af7286d9aefec7feff14b45f..74781afb84eeaafd77b1057ad9ee9bac259632a3 100644 (file)
--- a/sope-gdl1/GDLAccess/EOSQLExpression.m
+++ b/sope-gdl1/GDLAccess/EOSQLExpression.m
@@ -26,19 +26,19 @@
 
 #include "EOSQLExpression.h"
 #include "common.h"
-#import "EOAdaptor.h"
-#import "EOAdaptorChannel.h"
-#import "EOAdaptorContext.h"
-#import "EOAttribute.h"
-#import "EOAttributeOrdering.h"
-#import "EOEntity.h"
-#import "EOFExceptions.h"
-#import "EOSQLQualifier.h"
-#import "EORelationship.h"
-#import <EOControl/EOFetchSpecification.h>
-#import <EOControl/EONull.h>
-#import <EOControl/EOQualifier.h>
-#import <EOControl/EOSortOrdering.h>
+#include "EOAdaptor.h"
+#include "EOAdaptorChannel.h"
+#include "EOAdaptorContext.h"
+#include "EOAttribute.h"
+#include "EOAttributeOrdering.h"
+#include "EOEntity.h"
+#include "EOFExceptions.h"
+#include "EOSQLQualifier.h"
+#include "EORelationship.h"
+#include <EOControl/EOFetchSpecification.h>
+#include <EOControl/EONull.h>
+#include <EOControl/EOQualifier.h>
+#include <EOControl/EOSortOrdering.h>
 
 #if LIB_FOUNDATION_LIBRARY
 #  include <extensions/DefaultScannerHandler.h>

diff --git a/sope-gdl1/GDLAccess/Version b/sope-gdl1/GDLAccess/Version
index b8f0fed54a42bb84fdba691a114d6b0872b2f977..063faafb4c27540a9ba0e6b8df743c7cf2c48e11 100644 (file)
--- a/sope-gdl1/GDLAccess/Version
+++ b/sope-gdl1/GDLAccess/Version
@@ -1,3 +1,3 @@
 # version file
 
-SUBMINOR_VERSION:=51
+SUBMINOR_VERSION:=52