Avoid unused value warnings.

diff --git a/ChangeLog b/ChangeLog
index 059e847ad02d23647af467fd0bdf82de5bbd4627..e6f31b88ac38291402f2ba22e95b04cae9730c29 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-17  Bruno Haible  <bruno@clisp.org>
+
+       * lib/tls.h (gl_tls_key_init): Evaluate the destructor argument also
+       when the macro ignores it.
+       Based on a patch by Eric Blake <ebb9@byu.net>.
+
 2008-06-17  Bruno Haible  <bruno@clisp.org>
 
        * modules/tls (License): Change to LGPLv2+.

diff --git a/lib/tls.h b/lib/tls.h
index 09faadeecf31a9ff0377cabd6e3fa960e763ef7f..9b195063d1678cc0d820de455a293024d14efed9 100644 (file)
--- a/lib/tls.h
+++ b/lib/tls.h
@@ -1,5 +1,5 @@
 /* Thread-local storage in multithreaded situations.
-   Copyright (C) 2005, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2007-2008 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
@@ -285,6 +285,7 @@ typedef DWORD gl_tls_key_t;
       {                                          \
         if (((NAME) = TlsAlloc ()) == (DWORD)-1) \
           abort ();                              \
+        (void) (DESTRUCTOR);                     \
       }                                          \
     while (0)
 # define gl_tls_get(NAME) \
@@ -320,7 +321,8 @@ typedef struct
         }
         gl_tls_key_t;
 # define gl_tls_key_init(NAME, DESTRUCTOR) \
-    (NAME).singlethread_value = NULL
+    ((NAME).singlethread_value = NULL, \
+     (void) (DESTRUCTOR))
 # define gl_tls_get(NAME) \
     (NAME).singlethread_value
 # define gl_tls_set(NAME, POINTER) \