Re: BUG gettext-0.16.1 ("void" instead of "void *" in gettext-tools/gnulib-lib/tls.c)

[Bruno Haible]

Hi,

Arto C. Nirkko <address@hidden> wrote:
> the building of GNU gettext-0.16.1 on Solaris 2.6
> using --enable-threads=solaris fails because of a typo
> (missing '*') in gettext-tools/gnulib-lib/tls.c
> (see output below).
> 
> Fix: 
> void *
> glthread_tls_get (thread_key_t key)
> 
> instead of:
> void
> glthread_tls_get (thread_key_t key)
> 
> Greetings,
> Arto
> 
> 
>  gcc -DHAVE_CONFIG_H "-DEXEEXT=\"\"" "-DEXEEXT=\"\"" -I. -I.. -I../intl 
> -I../intl -I../intl -I.. -I.. -DDEPENDS_ON_LIBICONV=1 -DDEPENDS_ON_LIBINTL=1 
> "-DEXEEXT=\"\"" -I/usr/local/gnu/libiconv/include -O3 -mcpu=supersparc 
> -mno-app-regs -c tls.c  -fPIC -DPIC -o .libs/tls.o
> tls.c:46: error: conflicting types for 'glthread_tls_get'
> tls.h:247: error: previous declaration of 'glthread_tls_get' was here
> tls.c: In function 'glthread_tls_get':
> tls.c:51: warning: 'return' with a value, in function returning void
> gmake[4]: *** [tls.lo] Error 1
> gmake[4]: Leaving directory `/build/gettext-0.16.1/gettext-tools/gnulib-lib'

Thanks for the report. I'm applying your fix:

2007-04-13  Bruno Haible  <address@hidden>

        * lib/tls.c (glthread_tls_get): Fix return type.
        Patch by Arto C. Nirkko <address@hidden>.

--- lib/tls.c   14 Sep 2006 14:18:36 -0000      1.3
+++ lib/tls.c   13 Apr 2007 11:01:11 -0000
@@ -1,5 +1,5 @@
 /* Thread-local storage in multithreaded situations.
-   Copyright (C) 2005-2006 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007 Free Software Foundation, Inc.
 
    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
@@ -41,7 +41,7 @@
 
 /* ------------------------- gl_tls_key_t datatype ------------------------- */
 
-void
+void *
 glthread_tls_get (thread_key_t key)
 {
   void *value;