diff options
| author | Joakim Verona | 2013-01-05 00:04:41 +0100 |
|---|---|---|
| committer | Joakim Verona | 2013-01-05 00:04:41 +0100 |
| commit | b18e01b65e651d3b626b4edcaaa2aa636fe25b69 (patch) | |
| tree | 2832e227a4c45d3a4d423f972df29fb7f8616b14 /lib/strftime.c | |
| parent | 55b74b54b179f340bdb311070273f26da3fbd0c9 (diff) | |
| parent | 1bd71e9fe16541bc48868a00ff372018961380b0 (diff) | |
| download | emacs-b18e01b65e651d3b626b4edcaaa2aa636fe25b69.tar.gz emacs-b18e01b65e651d3b626b4edcaaa2aa636fe25b69.zip | |
auto upstream
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 | ) |