mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 15:00:45 -08:00
Code Issues Projects Releases Wiki Activity

* strftime.c: Revert conversion to standard C (2010-07-04T07:50:25Z!dann@ics.uci.edu).

Browse source
This commit is contained in:
Juanma Barranquero 2010-07-04 22:42:36 +02:00
parent 5b98e31f69
commit e6cb2cbb4a
2 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2010-07-04 Juanma Barranquero <lekktu@gmail.com>
* strftime.c: Revert conversion to standard C (2010-07-04T07:50:25Z!dann@ics.uci.edu).
2010-07-04 Juanma Barranquero <lekktu@gmail.com>
Fix prototypes.

23
src/strftime.c
View file

@ -367,7 +367,11 @@ static CHAR_T *memcpy_lowcase (CHAR_T *dest, const CHAR_T *src,
size_t len LOCALE_PARAM_PROTO);
static CHAR_T *
memcpy_lowcase (char *dest, const char *src, size_t len)
memcpy_lowcase (dest, src, len LOCALE_PARAM)
CHAR_T *dest;
const CHAR_T *src;
size_t len;
LOCALE_PARAM_DECL
{
while (len-- > 0)
dest[len] = TOLOWER ((UCHAR_T) src[len], loc);
@ -378,7 +382,11 @@ static CHAR_T *memcpy_uppcase (CHAR_T *dest, const CHAR_T *src,
size_t len LOCALE_PARAM_PROTO);
static CHAR_T *
memcpy_uppcase (char *dest, const char *src, size_t len)
memcpy_uppcase (dest, src, len LOCALE_PARAM)
CHAR_T *dest;
const CHAR_T *src;
size_t len;
LOCALE_PARAM_DECL
{
while (len-- > 0)
dest[len] = TOUPPER ((UCHAR_T) src[len], loc);
@ -429,7 +437,9 @@ static int iso_week_days (int, int);
__inline__
#endif
static int
iso_week_days (int yday, int wday)
iso_week_days (yday, wday)
int yday;
int wday;
{
/* Add enough to the first operand of % to make it nonnegative. */
int big_enough_multiple_of_7 = (-YDAY_MINIMUM / 7 + 2) * 7;
@ -1464,7 +1474,12 @@ libc_hidden_def (my_strftime)
/* For Emacs we have a separate interface which corresponds to the normal
strftime function plus the ut argument, but without the ns argument. */
size_t
emacs_strftimeu (char *s, size_t maxsize, const char *format, const struct tm *tp, int ut)
emacs_strftimeu (s, maxsize, format, tp, ut)
char *s;
size_t maxsize;
const char *format;
const struct tm *tp;
int ut;
{
return my_strftime (s, maxsize, format, tp, ut, 0);
}