From 67a7356b320482dfc404f57d7f23615076934f2c Mon Sep 17 00:00:00 2001
From: Paolo Carlini <pcarlini@suse.de>
Date: Sun, 27 May 2007 14:50:21 +0000
Subject: [PATCH] 2007-05-27  Paolo Carlini  <pcarlini@suse.de>

	* include/tr1/boost_shared_ptr.h
	(_Sp_counted_base<_S_mutex>::_M_add_ref_lock()): Do not wrap in
	#ifdef __GTHREADS.

2007-05-27  Paolo Carlini  <pcarlini@suse.de>

	* include/c_global/cwchar: Do not include <ctime>.
	* include/c_std/cwchar: Likewise.
	* include/ext/throw_allocator.h: Do it here.

From-SVN: r125112
---
 libstdc++-v3/ChangeLog                      | 12 ++++++++++++
 libstdc++-v3/include/c_global/cwchar        |  4 ++--
 libstdc++-v3/include/c_std/cwchar           |  4 ++--
 libstdc++-v3/include/ext/throw_allocator.h  |  1 +
 libstdc++-v3/include/tr1/boost_shared_ptr.h |  2 --
 5 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 488577362c9..7db46b252f1 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,15 @@
+2007-05-27  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/tr1/boost_shared_ptr.h
+	(_Sp_counted_base<_S_mutex>::_M_add_ref_lock()): Do not wrap in
+	#ifdef __GTHREADS.
+
+2007-05-27  Paolo Carlini  <pcarlini@suse.de>
+
+	* include/c_global/cwchar: Do not include <ctime>.
+	* include/c_std/cwchar: Likewise.
+	* include/ext/throw_allocator.h: Do it here.
+	
 2007-05-25  Paolo Carlini  <pcarlini@suse.de>
 
 	* config/locale/gnu/c_locale.h (__convert_from_v): Fix typo.
diff --git a/libstdc++-v3/include/c_global/cwchar b/libstdc++-v3/include/c_global/cwchar
index 6e867342478..c49ebbd60fc 100644
--- a/libstdc++-v3/include/c_global/cwchar
+++ b/libstdc++-v3/include/c_global/cwchar
@@ -1,6 +1,7 @@
 // -*- C++ -*- forwarding header.
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -46,7 +47,6 @@
 
 #include <bits/c++config.h>
 #include <cstddef>
-#include <ctime>
 
 #if _GLIBCXX_HAVE_WCHAR_H
 #include_next <wchar.h>
diff --git a/libstdc++-v3/include/c_std/cwchar b/libstdc++-v3/include/c_std/cwchar
index 20cb8041e79..19ce17deceb 100644
--- a/libstdc++-v3/include/c_std/cwchar
+++ b/libstdc++-v3/include/c_std/cwchar
@@ -1,6 +1,7 @@
 // -*- C++ -*- forwarding header.
 
-// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+// 2006, 2007
 // Free Software Foundation, Inc.
 //
 // This file is part of the GNU ISO C++ Library.  This library is free
@@ -49,7 +50,6 @@
 
 #include <bits/c++config.h>
 #include <cstddef>
-#include <ctime>
 
 #if _GLIBCXX_HAVE_WCHAR_H
 #include <wchar.h>
diff --git a/libstdc++-v3/include/ext/throw_allocator.h b/libstdc++-v3/include/ext/throw_allocator.h
index 869aa4245ec..bb2707d376f 100644
--- a/libstdc++-v3/include/ext/throw_allocator.h
+++ b/libstdc++-v3/include/ext/throw_allocator.h
@@ -55,6 +55,7 @@
 #define _THROW_ALLOCATOR_H 1
 
 #include <cmath>
+#include <ctime>
 #include <map>
 #include <set>
 #include <string>
diff --git a/libstdc++-v3/include/tr1/boost_shared_ptr.h b/libstdc++-v3/include/tr1/boost_shared_ptr.h
index d90e6ff8171..0e56af56efc 100644
--- a/libstdc++-v3/include/tr1/boost_shared_ptr.h
+++ b/libstdc++-v3/include/tr1/boost_shared_ptr.h
@@ -194,7 +194,6 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
 	}
     }
 
-#ifdef __GTHREADS
   template<>
     inline void
     _Sp_counted_base<_S_mutex>::
@@ -207,7 +206,6 @@ _GLIBCXX_BEGIN_NAMESPACE(_GLIBCXX_TR1)
 	  __throw_bad_weak_ptr();
 	}
     }
-#endif
 
   template<> 
     inline void