diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c12e50cc9f6..db08bef03c2 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-06  Roger Sayle  <roger@eyesopen.com>
+
+	* include/std/system_error (is_error_code_enum): Use identifier
+	_Tp instead of _T to avoid conflict with system macro on Darwin.
+	(is_error_condition_enum): Likewise.
+
 2008-07-05  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* include/bits/postypes.h: Do not include <stdint.h>.
diff --git a/libstdc++-v3/include/std/system_error b/libstdc++-v3/include/std/system_error
index 343eb6e83f7..b0585810663 100644
--- a/libstdc++-v3/include/std/system_error
+++ b/libstdc++-v3/include/std/system_error
@@ -53,7 +53,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
   class system_error;
 
   /// is_error_code_enum
-  template<typename _T>
+  template<typename _Tp>
     struct is_error_code_enum : public false_type { };
 
   template<> 
@@ -61,7 +61,7 @@ _GLIBCXX_BEGIN_NAMESPACE(std)
     : public true_type { };
 
   /// is_error_condition_enum
-  template<typename _T>
+  template<typename _Tp>
     struct is_error_condition_enum : public false_type { };
 
   template<>