locale.cc (locale::_S_initialize): Use __gthread_active_p.

2003-10-02  Benjamin Kosnik  <bkoz@redhat.com>

	* src/locale.cc (locale::_S_initialize): Use __gthread_active_p.
	(locale::facet::_S_get_c_locale): Same.

From-SVN: r72045

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 59b6bff..7224004 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,10 @@
 2003-10-02  Benjamin Kosnik  <bkoz@redhat.com>
 
+       * src/locale.cc (locale::_S_initialize): Use __gthread_active_p.
+       (locale::facet::_S_get_c_locale): Same.
+       
+2003-10-02  Benjamin Kosnik  <bkoz@redhat.com>
+
        * config/linker-map.gnu: Export _S_get_c_locale instead of
        _S_c_locale object.
 

diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc
index b37b30c..1ba83d1 100644 (file)
--- a/libstdc++-v3/src/locale.cc
+++ b/libstdc++-v3/src/locale.cc
@@ -385,11 +385,14 @@ namespace std
   locale::_S_initialize()
   {
 #ifdef __GTHREADS
-    __gthread_once(&_S_once, _S_initialize_once);
-#else
-    if (!_S_classic)
-      _S_initialize_once();
+    if (__gthread_active_p())
+      __gthread_once(&_S_once, _S_initialize_once);
+    else
 #endif
+      {
+       if (!_S_classic)
+         _S_initialize_once();
+      }
   }
 
   void
@@ -472,11 +475,14 @@ namespace std
   locale::facet::_S_get_c_locale()
   {
 #ifdef __GHTREADS
-    __gthread_once(&_S_once, _S_initialize_once);
-#else
-    if (!_S_c_locale)
-      _S_initialize_once();
+    if (__gthread_active_p())
+      __gthread_once(&_S_once, _S_initialize_once);
+    else
 #endif
+      {
+       if (!_S_c_locale)
+         _S_initialize_once();
+      }
     return _S_c_locale;
   }