locale.cc (locale::_S_initialize): Re-apply workaround a confusion of the use of…

locale.cc (locale::_S_initialize): Re-apply workaround a confusion of the use of the gthr API when...


2003-10-18  Andreas Tobler  <a.tobler@schweiz.ch>

	* src/locale.cc (locale::_S_initialize): Re-apply workaround a
	confusion of the use of the gthr API when __gthread_active_p()
	returns true.

From-SVN: r72679

libstdc++-v3/ChangeLog

+2003-10-18  Andreas Tobler  <a.tobler@schweiz.ch>
+
+	* src/locale.cc (locale::_S_initialize): Re-apply workaround a
+	confusion of the use of the gthr API when __gthread_active_p()
+	returns true.
+
 2003-10-17  Benjamin Kosnik  <bkoz@redhat.com>
  
 	* src/Makefile.am: Add new files.

libstdc++-v3/src/locale_init.cc

@@ -143,12 +143,9 @@ namespace std
 #ifdef __GTHREADS
     if (__gthread_active_p())
       __gthread_once(&_S_once, _S_initialize_once);
-    else
 #endif
-      {
-	if (!_S_classic)
-	  _S_initialize_once();
-      }
+    if (!_S_classic)
+      _S_initialize_once();
   }
 
   // Definitions for static const data members of locale::_Impl