From 8fb735ef340e2a33619a35692876f69814fc7cce Mon Sep 17 00:00:00 2001
From: fredkiefer <fredkiefer@72102866-910b-0410-8b05-ffd578937521>
Date: Sat, 11 Jun 2011 15:32:37 +0000
Subject: [PATCH] Add rest of Sebastian's patch.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33280 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                | 2 ++
 Source/NSDateFormatter.m | 2 ++
 Source/NSTimeZone.m      | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 79ac7ba70..a4fd1b75f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-06-11 Fred Kiefer <FredKiefer@gmx.de>
 
+	* Source/NSDateFormatter.m,
+	* Source/NSTimeZone.m,
 	* Source\NSCalendar.m: Protect the name id.
 	Patch by Sebastian Reitenbach <sebastia@l00-bugdead-prods.de>
 
diff --git a/Source/NSDateFormatter.m b/Source/NSDateFormatter.m
index 7258d86e6..4c916f49c 100644
--- a/Source/NSDateFormatter.m
+++ b/Source/NSDateFormatter.m
@@ -39,7 +39,9 @@
 #import "Foundation/NSCoder.h"
 
 #if defined(HAVE_UNICODE_UDAT_H)
+#define id id_ucal
 #include <unicode/udat.h>
+#undef id
 #endif
 #if defined(HAVE_UNICODE_UDATPG_H)
 #include <unicode/udatpg.h>
diff --git a/Source/NSTimeZone.m b/Source/NSTimeZone.m
index fa3f963c3..e627d9bc7 100644
--- a/Source/NSTimeZone.m
+++ b/Source/NSTimeZone.m
@@ -120,7 +120,9 @@
 #endif
 
 #if defined(HAVE_UNICODE_UCAL_H)
+#define id id_ucal
 #include <unicode/ucal.h>
+#undef id
 #endif
 
 NSString * const NSSystemTimeZoneDidChangeNotification