PR c++/6492

[pf3gnuchains/gcc-fork.git] / gcc / gthr.h

diff --git a/gcc/gthr.h b/gcc/gthr.h
index 54ad6b0..ba3a3be 100644 (file)
--- a/gcc/gthr.h
+++ b/gcc/gthr.h
@@ -1,23 +1,23 @@
-/* Threads compatibily routines for libgcc2.  */
+/* Threads compatibility routines for libgcc2.  */
 /* Compile this one with gcc.  */
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1998 Free Software Foundation, Inc.
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
 
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.  */
 
 /* As a special exception, if you link this library with other files,
    some of which are compiled with GCC, to produce an executable,
@@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA.  */
    This exception does not however invalidate any other reasons why
    the executable file might be covered by the GNU General Public License.  */
 
-#ifndef __gthr_h
-#define __gthr_h
+#ifndef GCC_GTHR_H
+#define GCC_GTHR_H
 
 /* If this file is compiled with threads support, it must
        #define __GTHREADS 1
@@ -48,6 +48,12 @@ Boston, MA 02111-1307, USA.  */
      __GTHREAD_MUTEX_INIT
                to initialize __gthread_mutex_t to get a fast
                non-recursive mutex.
+     __GTHREAD_MUTEX_INIT_FUNCTION
+               some systems can't initialize a mutex without a
+               function call.  On such systems, define this to a
+               function which looks like this:
+                 void __GTHREAD_MUTEX_INIT_FUNCTION (__gthread_mutex_t *)
+               Don't define __GTHREAD_MUTEX_INIT in this case
 
    The threads interface must define the following static functions:
 
@@ -65,7 +71,8 @@ Boston, MA 02111-1307, USA.  */
      int __gthread_mutex_trylock (__gthread_mutex_t *mutex);
      int __gthread_mutex_unlock (__gthread_mutex_t *mutex);
 
-   All functions returning int should return 0 on success, -1 on error.
+   All functions returning int should return zero on success or the error
+   number.  If the operation is not supported, -1 is returned.
 
    Currently supported threads packages are
      POSIX threads with -D_PTHREADS
@@ -73,7 +80,7 @@ Boston, MA 02111-1307, USA.  */
      Solaris/UI threads with -D_SOLARIS_THREADS
 */
 
-/* Check first for thread specific defines. */
+/* Check first for thread specific defines.  */
 #if _PTHREADS
 #include "gthr-posix.h"
 #elif _DCE_THREADS
@@ -81,16 +88,18 @@ Boston, MA 02111-1307, USA.  */
 #elif _SOLARIS_THREADS
 #include "gthr-solaris.h"
 
-/* Include GTHREAD_FILE if one is defined. */
-#elif SUPPORTS_WEAK && HAVE_GTHR_DEFAULT
+/* Include GTHREAD_FILE if one is defined.  */
+#elif defined(HAVE_GTHR_DEFAULT)
+#if SUPPORTS_WEAK
 #ifndef GTHREAD_USE_WEAK
 #define GTHREAD_USE_WEAK 1
 #endif
+#endif
 #include "gthr-default.h"
 
-/* Fallback to single thread definitions. */
+/* Fallback to single thread definitions.  */
 #else
 #include "gthr-single.h"
 #endif
 
-#endif /* not __gthr_h */
+#endif /* ! GCC_GTHR_H */