X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ftls.c;h=f85ce033fc7d39f1bff9a4170973ff0052526e83;hb=2f2f93bfb6e0991467a287c1f4a3e0c13b227ef1;hp=567fdac094f1ba00f37e792df1ce6efdb2426f98;hpb=a897449aaae8e6c051f3b9daaf984de5c5e092f3;p=gnulib.git

diff --git a/lib/tls.c b/lib/tls.c
index 567fdac09..f85ce033f 100644
--- a/lib/tls.c
+++ b/lib/tls.c
@@ -1,10 +1,10 @@
 /* Thread-local storage in multithreaded situations.
-   Copyright (C) 2005 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program 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.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,14 +12,11 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Bruno Haible <bruno@clisp.org>, 2005.  */
 
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include "tls.h"
 
@@ -43,7 +40,7 @@
 
 /* ------------------------- gl_tls_key_t datatype ------------------------- */
 
-void
+void *
 glthread_tls_get (thread_key_t key)
 {
   void *value;