2 files changed, 23 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index d4a411b1d5e..6364deb2db1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 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.
 
         * atimer.c (start_atimer): Use EMACS_TIME, not struct timeval.
diff --git a/src/strftime.c b/src/strftime.c
index e07d89fb509..a7617427793 100644
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -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);
 }