From a348369fbbc60d602e34637ab7399e8664d0af26 Mon Sep 17 00:00:00 2001
From: Gregory John Casamento <greg.casamento@gmail.com>
Date: Sun, 12 Jun 2011 13:44:48 +0000
Subject: [PATCH] 	* CoreDataHeaders.h: Conditionally use the defines for
 _, ASSIGN, and 	RETAIN when the framework is not being compiled using
 GNUstep and 	GNUSTEP is not defined.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep@33286 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog         | 6 ++++++
 CoreDataHeaders.h | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 41995fd..3059339 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-12 09:42-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* CoreDataHeaders.h: Conditionally use the defines for _, ASSIGN, and
+	RETAIN when the framework is not being compiled using GNUstep and
+	GNUSTEP is not defined.
+
 2010-12-27  Nicola Pero <nicola.pero@meta-innovation.com>
 
 	* NSAttributeDescription.m ([-initWithCoder:],
diff --git a/CoreDataHeaders.h b/CoreDataHeaders.h
index c0530ba..5df76a8 100644
--- a/CoreDataHeaders.h
+++ b/CoreDataHeaders.h
@@ -22,6 +22,7 @@
 	Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111 USA.
 */
 
+#ifndef GNUSTEP /* if and only if we are not compiling under GNUstep, should these be defined */
 #ifndef ASSIGN
 #define ASSIGN(VAR, VAL) [(VAR) autorelease], (VAR)=[(VAL) retain]
 #endif
@@ -34,6 +35,7 @@
 #ifndef _
 #define _(STR) STR
 #endif
+#endif
 
 #import <CoreData/CoreData.h>
 #import "CoreDataUtilities.h"