X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fignore-value.h;h=2eb6918db579a258af4e2046508ea09866c81e1e;hb=b187ff0528e2a081392a834e684d1d0c161708a7;hp=5f97c91c3f2fa6d622daae1c010de6d44d464ece;hpb=2c77dff78db5fb5aef6078bb0ccf054bf483b131;p=gnulib.git

diff --git a/lib/ignore-value.h b/lib/ignore-value.h
index 5f97c91c3..2eb6918db 100644
--- a/lib/ignore-value.h
+++ b/lib/ignore-value.h
@@ -1,6 +1,6 @@
-/* ignore a value to quiet a compiler warning
+/* ignore a function return without a compiler warning
 
-   Copyright (C) 2008 Free Software Foundation, Inc.
+   Copyright (C) 2008-2010 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
@@ -17,13 +17,7 @@
 
 /* Written by Jim Meyering.  */
 
-#ifndef __attribute__
-# if __GNUC__ < 2 || (__GNUC__ == 2 && __GNUC_MINOR__ < 8)
-#  define __attribute__(x)
-# endif
-#endif
-
-/* Use this function to avoid a warning when using a function declared with
+/* Use these functions to avoid a warning when using a function declared with
    gcc's warn_unused_result attribute, but for which you really do want to
    ignore the result.  Traditionally, people have used a "(void)" cast to
    indicate that a function's return value is deliberately unused.  However,
@@ -38,8 +32,6 @@
    "copy.c:233: warning: ignoring return value of 'fchown',
    declared with attribute warn_unused_result".  */
 
-static inline void
-ignore_value (int i __attribute__ ((__unused__)))
-{
-  /* empty */
-}
+static inline void ignore_value (int i) { (void) i; }
+static inline void ignore_ptr (void* p) { (void) p; }
+/* FIXME: what about aggregate types? */