projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
2007-02-05 Paolo Bonzini <bonzini@gnu.org>
[gnulib.git]
/
lib
/
strftime.c
diff --git
a/lib/strftime.c
b/lib/strftime.c
index
ffa51c0
..
3fce99b
100644
(file)
--- a/
lib/strftime.c
+++ b/
lib/strftime.c
@@
-1,4
+1,4
@@
-/* Copyright (C) 1991-1999, 2000, 2001, 2003, 2004, 2005, 2006 Free Software
+/* Copyright (C) 1991-1999, 2000, 2001, 2003, 2004, 2005, 2006
, 2007
Free Software
Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C Library.
Foundation, Inc.
NOTE: The canonical source of this file is maintained with the GNU C Library.
@@
-36,18
+36,8
@@
#endif
#include <ctype.h>
#endif
#include <ctype.h>
-#include <
sys/types.h> /* Some systems define `time_t' here. */
+#include <
time.h>
-#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
#if HAVE_TZNAME && ! defined tzname
extern char *tzname[];
#endif
#if HAVE_TZNAME && ! defined tzname
extern char *tzname[];
#endif
@@
-58,7
+48,7
@@
extern char *tzname[];
conversion specifications. The GNU C Library uses UTF8 multibyte
encoding, which is safe for formats, but strftime.c can be used
with other C libraries that use unsafe encodings. */
conversion specifications. The GNU C Library uses UTF8 multibyte
encoding, which is safe for formats, but strftime.c can be used
with other C libraries that use unsafe encodings. */
-#define DO_MULTIBYTE (HAVE_MBLEN &&
HAVE_WCHAR_H &&
! MULTIBYTE_IS_FORMAT_SAFE)
+#define DO_MULTIBYTE (HAVE_MBLEN && ! MULTIBYTE_IS_FORMAT_SAFE)
#if DO_MULTIBYTE
# if HAVE_MBRLEN
#if DO_MULTIBYTE
# if HAVE_MBRLEN
@@
-181,6
+171,12
@@
extern char *tzname[];
# define memset_zero(P, Len) (memset (P, '0', Len), (P) += (Len))
#endif
# define memset_zero(P, Len) (memset (P, '0', Len), (P) += (Len))
#endif
+#if FPRINTFTIME
+# define advance(P, N)
+#else
+# define advance(P, N) ((P) += (N))
+#endif
+
#define add(n, f) \
do \
{ \
#define add(n, f) \
do \
{ \
@@
-199,7
+195,7
@@
extern char *tzname[];
memset_space (p, _delta); \
} \
f; \
memset_space (p, _delta); \
} \
f; \
-
p += FPRINTFTIME ? 0 : _n;
\
+
advance (p, _n);
\
} \
i += _incr; \
} while (0)
} \
i += _incr; \
} while (0)