(my_strftime): Make sure we call the system

strftime, not ourselves, when invoking the underlying strftime.

diff --git a/lib/strftime.c b/lib/strftime.c
index 95e55cba514ecc79ff87d7bd34c1a0953208bb9a..f3dcd77f4aa97479b15b64cea1dd3ea23c51de24 100644 (file)
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1999, 2000 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
    Bugs can be reported to bug-glibc@prep.ai.mit.edu.
@@ -817,6 +817,13 @@ my_strftime (s, maxsize, format, tp ut_argument)
            char *u = ufmt;
            char ubuf[1024]; /* enough for any single format in practice */
            size_t len;
+           /* Make sure we're calling the actual underlying strftime.
+              In some cases, config.h contains something like
+              "#define strftime rpl_strftime".  */
+# ifdef strftime
+#  undef strftime
+# endif
+
            *u++ = '%';
            if (modifier != 0)
              *u++ = modifier;