diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2013-01-03 18:17:49 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2013-01-03 18:17:49 -0800 |
| commit | ee0d39381afabe6ca81701e786fa506239e261d2 (patch) | |
| tree | 7f04c7ae2157f42b11f9f718cfdff1de458a4242 /lib/strftime.c | |
| parent | 342532db2bf1f9d9efcd2073b6f4395db548df5a (diff) | |
| download | emacs-ee0d39381afabe6ca81701e786fa506239e261d2.tar.gz | |
Merge from gnulib.
This incorporates:
2013-01-04 stdio: remove now-unnecessary stdio.c
2013-01-04 fprintftime: depend on stdio, not ignore-value
2013-01-04 fwrite: silence __wur only for older glibc versions
2013-01-04 fwrite: silence __wur without using inline
* lib/stdio.c: Remove.
* lib/stdio.in.h, lib/strftime.c: Update from gnulib.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
Diffstat (limited to 'lib/strftime.c')
| -rw-r--r-- | lib/strftime.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/lib/strftime.c b/lib/strftime.c index 1d58f2a160b..213ced860de 100644 --- a/lib/strftime.c +++ b/lib/strftime.c @@ -26,7 +26,6 @@ #else # include <config.h> # if FPRINTFTIME -# include "ignore-value.h" # include "fprintftime.h" # else # include "strftime.h" @@ -209,15 +208,7 @@ extern char *tzname[]; else if (to_uppcase) \ fwrite_uppcase (p, (s), _n); \ else \ - { \ - /* We are ignoring the value of fwrite here, in spite of the \ - fact that technically, that may not be valid: the fwrite \ - specification in POSIX 2008 defers to that of fputc, which \ - is intended to be consistent with the one from ISO C, \ - which permits failure due to ENOMEM *without* setting the \ - stream's error indicator. */ \ - ignore_value (fwrite ((s), _n, 1, p)); \ - } \ + fwrite (s, _n, 1, p); \ } \ while (0) \ ) |