X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fignore-value.h;h=f021a1ac8eaa6a4b3b1cac59e13325ad45425f5c;hb=aa4ddc3;hp=8f60b0e60d5e244000db8499992e05d7f7744e43;hpb=b24bc2972d0a25af9bbdc1d8a6df7a62a061e5b6;p=gnulib.git

diff --git a/lib/ignore-value.h b/lib/ignore-value.h
index 8f60b0e60..f021a1ac8 100644
--- a/lib/ignore-value.h
+++ b/lib/ignore-value.h
@@ -15,7 +15,7 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-/* Written by Jim Meyering and Pádraig Brady.  */
+/* Written by Jim Meyering, Eric Blake and Pádraig Brady.  */
 
 /* Use "ignore_value" to avoid a warning when using a function declared with
    gcc's warn_unused_result attribute, but for which you really do want to
@@ -35,25 +35,28 @@
 #ifndef _GL_IGNORE_VALUE_H
 # define _GL_IGNORE_VALUE_H
 
-# include <stdint.h>
-
-# ifndef ATTRIBUTE_DEPRECATED
+# ifndef _GL_ATTRIBUTE_DEPRECATED
 /* The __attribute__((__deprecated__)) feature
    is available in gcc versions 3.1 and newer.  */
 #  if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 1)
-#   define ATTRIBUTE_DEPRECATED /* empty */
+#   define _GL_ATTRIBUTE_DEPRECATED /* empty */
 #  else
-#   define ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__))
+#   define _GL_ATTRIBUTE_DEPRECATED __attribute__ ((__deprecated__))
 #  endif
 # endif
 
-static inline void _ignore_value (intptr_t p) { (void) p; }
-# define ignore_value(x) _ignore_value ((intptr_t) x)
+/* The __attribute__((__warn_unused_result__)) feature
+   is available in gcc versions 3.4 and newer,
+   while the typeof feature has been available since 2.7 at least.  */
+# if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ < 4)
+#  define ignore_value(x) ((void) (x))
+# else
+#  define ignore_value(x) (({ __typeof__ (x) __x = (x); (void) __x; }))
+# endif
 
-/* ignore_value works for both scalars and pointers; deprecate ignore_ptr.  */
-static inline void ATTRIBUTE_DEPRECATED
+/* ignore_value works for scalars, pointers and aggregates;
+   deprecate ignore_ptr.  */
+static inline void _GL_ATTRIBUTE_DEPRECATED
 ignore_ptr (void *p) { (void) p; } /* deprecated: use ignore_value */
 
-/* FIXME: what about aggregate types? */
-
 #endif