# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1260343230 18000
# Node ID 31436dcf7d0fc2d905205076b0aaa0c08319dbcb
# Parent  55061c7c8d6edd245848603db474b38cc92b81b9
call nstrftime, not my_strftime

diff -r 55061c7c8d6e -r 31436dcf7d0f liboctave/ChangeLog
--- a/liboctave/ChangeLog	Wed Dec 09 01:36:50 2009 -0500
+++ b/liboctave/ChangeLog	Wed Dec 09 02:20:30 2009 -0500
@@ -1,3 +1,8 @@
+2009-12-09  John W. Eaton  <jwe@octave.org>
+
+	* oct-time.cc (octave_base_tm::strftime): Call nstrftime instead
+	of my_strftime.
+
 2009-12-09  John W. Eaton  <jwe@octave.org>
 
 	* oct-time.cc: Include strftime.h.  Don't provide decl for strftime.
diff -r 55061c7c8d6e -r 31436dcf7d0f liboctave/oct-time.cc
--- a/liboctave/oct-time.cc	Wed Dec 09 01:36:50 2009 -0500
+++ b/liboctave/oct-time.cc	Wed Dec 09 02:20:30 2009 -0500
@@ -267,7 +267,7 @@
 	  buf = new char[bufsize];
 	  buf[0] = '\0';
 
-	  chars_written = my_strftime (buf, bufsize, fmt_str, &t, 0, 0);
+	  chars_written = nstrftime (buf, bufsize, fmt_str, &t, 0, 0);
 
 	  bufsize *= 2;
 	}
diff -r 55061c7c8d6e -r 31436dcf7d0f src/ChangeLog
--- a/src/ChangeLog	Wed Dec 09 01:36:50 2009 -0500
+++ b/src/ChangeLog	Wed Dec 09 02:20:30 2009 -0500
@@ -1,3 +1,7 @@
+2009-12-09  John W. Eaton  <jwe@octave.org>
+
+	* load-save.cc: Call nstrftime instead of my_strftime.
+
 2009-12-09  John W. Eaton  <jwe@octave.org>
 
 	* load-save.cc: Include strftime.h.
diff -r 55061c7c8d6e -r 31436dcf7d0f src/load-save.cc
--- a/src/load-save.cc	Wed Dec 09 01:36:50 2009 -0500
+++ b/src/load-save.cc	Wed Dec 09 02:20:30 2009 -0500
@@ -1184,8 +1184,8 @@
 	bdt = *gmtime (&now);
 	memset (headertext, ' ', 124);
 	// ISO 8601 format date
-	my_strftime (headertext, 124, "MATLAB 5.0 MAT-file, written by Octave "
-		     OCTAVE_VERSION ", %Y-%m-%d %T UTC", &bdt, 1, 0);
+	nstrftime (headertext, 124, "MATLAB 5.0 MAT-file, written by Octave "
+                   OCTAVE_VERSION ", %Y-%m-%d %T UTC", &bdt, 1, 0);
 
 	// The first pair of bytes give the version of the MAT file
 	// format.  The second pair of bytes form a magic number which