Mercurial > octave-nkf
changeset 3750:c922e2d23c8c
[project @ 2000-12-09 07:34:11 by jwe]
author | jwe |
---|---|
date | Sat, 09 Dec 2000 07:34:12 +0000 |
parents | 55df6f9044f6 |
children | 1ae5be669422 |
files | ChangeLog aclocal.m4 liboctave/ChangeLog liboctave/strptime.c |
diffstat | 4 files changed, 15 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Dec 09 06:17:15 2000 +0000 +++ b/ChangeLog Sat Dec 09 07:34:12 2000 +0000 @@ -1,3 +1,8 @@ +2000-12-09 John W. Eaton <jwe@bevo.che.wisc.edu> + + * aclocal.m4: Give gperf a keyword, to avoid complaints from newer + versions. + 2000-11-27 Marcus.Brinkmann <Marcus.Brinkmann@ruhr-uni-bochum.de> * configure.in: Handle *-*-gnu* the same as *-*-linux* for shared
--- a/aclocal.m4 Sat Dec 09 06:17:15 2000 +0000 +++ b/aclocal.m4 Sat Dec 09 07:34:12 2000 +0000 @@ -875,7 +875,7 @@ if echo "%{ %} %% -" | $GPERF -t -C -D -E -G -L ANSI-C -H octave_kw_hash -N octave_kw_lookup > /dev/null 2>&1; then +foo" | $GPERF -t -C -D -E -G -L ANSI-C -H octave_kw_hash -N octave_kw_lookup > /dev/null 2>&1; then true else GPERF=""
--- a/liboctave/ChangeLog Sat Dec 09 06:17:15 2000 +0000 +++ b/liboctave/ChangeLog Sat Dec 09 07:34:12 2000 +0000 @@ -1,3 +1,8 @@ +2000-12-09 John W. Eaton <jwe@bevo.che.wisc.edu> + + * strptime.c: Surround everything after including config.h in + #ifndef HAVE_STRPTIME ... #endif. + 2000-11-29 John W. Eaton <jwe@bevo.che.wisc.edu> * Array-idx.h (assign): When resizing, cast fill value to LT.
--- a/liboctave/strptime.c Sat Dec 09 06:17:15 2000 +0000 +++ b/liboctave/strptime.c Sat Dec 09 07:34:12 2000 +0000 @@ -27,6 +27,8 @@ # include <config.h> #endif +#ifndef HAVE_STRPTIME + #include <ctype.h> #ifdef _LIBC # include <langinfo.h> @@ -869,3 +871,5 @@ #endif return strptime_internal (buf, format, tm, &decided); } + +#endif