diff options
| author | Paul Eggert | 2013-01-03 18:17:49 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-03 18:17:49 -0800 |
| commit | ee0d39381afabe6ca81701e786fa506239e261d2 (patch) | |
| tree | 7f04c7ae2157f42b11f9f718cfdff1de458a4242 /lib/strftime.c | |
| parent | 342532db2bf1f9d9efcd2073b6f4395db548df5a (diff) | |
| download | emacs-ee0d39381afabe6ca81701e786fa506239e261d2.tar.gz emacs-ee0d39381afabe6ca81701e786fa506239e261d2.zip | |
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 @@ | |||
| 26 | #else | 26 | #else |
| 27 | # include <config.h> | 27 | # include <config.h> |
| 28 | # if FPRINTFTIME | 28 | # if FPRINTFTIME |
| 29 | # include "ignore-value.h" | ||
| 30 | # include "fprintftime.h" | 29 | # include "fprintftime.h" |
| 31 | # else | 30 | # else |
| 32 | # include "strftime.h" | 31 | # include "strftime.h" |
| @@ -209,15 +208,7 @@ extern char *tzname[]; | |||
| 209 | else if (to_uppcase) \ | 208 | else if (to_uppcase) \ |
| 210 | fwrite_uppcase (p, (s), _n); \ | 209 | fwrite_uppcase (p, (s), _n); \ |
| 211 | else \ | 210 | else \ |
| 212 | { \ | 211 | fwrite (s, _n, 1, p); \ |
| 213 | /* We are ignoring the value of fwrite here, in spite of the \ | ||
| 214 | fact that technically, that may not be valid: the fwrite \ | ||
| 215 | specification in POSIX 2008 defers to that of fputc, which \ | ||
| 216 | is intended to be consistent with the one from ISO C, \ | ||
| 217 | which permits failure due to ENOMEM *without* setting the \ | ||
| 218 | stream's error indicator. */ \ | ||
| 219 | ignore_value (fwrite ((s), _n, 1, p)); \ | ||
| 220 | } \ | ||
| 221 | } \ | 212 | } \ |
| 222 | while (0) \ | 213 | while (0) \ |
| 223 | ) | 214 | ) |