* name-lookup.c (current_decl_namespace): Non-static.

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

diff --git a/gcc/gthr-tpf.h b/gcc/gthr-tpf.h
index c4b8f0b..fb23e91 100644 (file)
--- a/gcc/gthr-tpf.h
+++ b/gcc/gthr-tpf.h
@@ -6,7 +6,7 @@ This file is part of GCC.
 
 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
+Software Foundation; either version 3, or (at your option) any later
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
@@ -14,20 +14,16 @@ 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 GCC; see the file COPYING.  If not, write to the Free
-Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
-02110-1301, USA.  */
+Under Section 7 of GPL version 3, you are granted additional
+permissions described in the GCC Runtime Library Exception, version
+3.1, as published by the Free Software Foundation.
 
-/* As a special exception, if you link this library with other files,
-   some of which are compiled with GCC, to produce an executable,
-   this library does not by itself cause the resulting executable
-   to be covered by the GNU General Public License.
-   This exception does not however invalidate any other reasons why
-   the executable file might be covered by the GNU General Public License.  */
+You should have received a copy of the GNU General Public License and
+a copy of the GCC Runtime Library Exception along with this program;
+see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
+<http://www.gnu.org/licenses/>.  */
 
-
-/* TPF needs its own version of gthr-*.h because TPF always links to 
+/* TPF needs its own version of gthr-*.h because TPF always links to
    the thread library.  However, for performance reasons we still do not
    want to issue thread api calls unless a check is made to see that we
    are running as a thread.  */
@@ -210,7 +206,7 @@ __gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *__mutex)
 
 static inline int
 __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *__mutex)
-{ 
+{
   if (__tpf_pthread_active ())
     {
       pthread_mutexattr_t __attr;