From: Jim Meyering <jim@meyering.net>
Date: Mon, 3 Apr 2000 07:09:38 +0000 (+0000)
Subject: (my_strftime): Make sure we call the system
X-Git-Tag: cvs-readonly~6794
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=4c81c55a237f410592a5194f0b5419a6b7a2bfa1;p=gnulib.git

(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 95e55cba5..f3dcd77f4 100644
--- 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;