2013-05-15 Paul Eggert <eggert@cs.ucla.edu>
+ stdio: use __REDIRECT for fwrite, fwrite_unlocked
+ * lib/stdio.in.h (fwrite):
+ When working around bug 11959, use __REDIRECT rather than '#define
+ fwrite(...) ... fwrite (...) ...'. This is a more-targeted way to
+ fix the -Wunused-value issue with clang, and it works with GCC too.
+ Problem with targeting reported by Eric Blake in
+ <http://lists.gnu.org/archive/html/bug-gnulib/2013-05/msg00067.html>.
+ (fwrite_unlocked): Treat like fwrite. I ran into this issue while
+ debugging the fwrite issue.
+
stdio: port --enable-gcc-warnings to clang
* lib/stdio.in.h (fwrite) [__clang__]: Ignore -Wunused-value entirely,
since the GCC workaround for fwrite does not pacify clang.
versions of gcc and clang, and is not needed for C++. */
# if (0 < __USE_FORTIFY_LEVEL \
&& __GLIBC__ == 2 && 4 <= __GLIBC_MINOR__ && __GLIBC_MINOR__ <= 15 \
+ && 3 < __GNUC__ + (4 <= __GNUC_MINOR__) \
&& !defined __cplusplus)
-# ifdef __clang__
-# pragma clang diagnostic ignored "-Wunused-value"
-# elif 3 < __GNUC__ + (4 <= __GNUC_MINOR__)
-# undef fwrite
-# define fwrite(a, b, c, d) ({size_t __r = fwrite (a, b, c, d); __r; })
-# endif
+# undef fwrite
+# undef fwrite_unlocked
+extern size_t __REDIRECT (rpl_fwrite,
+ (const void *__restrict, size_t, size_t,
+ FILE *__restrict),
+ fwrite);
+extern size_t __REDIRECT (rpl_fwrite_unlocked,
+ (const void *__restrict, size_t, size_t,
+ FILE *__restrict),
+ fwrite_unlocked);
+# define fwrite rpl_fwrite
+# define fwrite_unlocked rpl_fwrite_unlocked
# endif
# endif
_GL_CXXALIASWARN (fwrite);