Mercurial > hg > octave-lyh
changeset 10463:bbe99b2a5ba7
undo recent gnulib-related changes
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 25 Mar 2010 17:30:07 -0400 |
| parents | 97a8ef453440 |
| children | 2da43cfcd414 |
| files | liboctave/ChangeLog liboctave/cmd-edit.cc liboctave/cmd-hist.cc liboctave/dir-ops.cc liboctave/file-ops.cc liboctave/file-stat.cc liboctave/lo-math.h liboctave/lo-utils.cc liboctave/oct-env.cc liboctave/oct-time.cc liboctave/oct-uname.cc src/ChangeLog src/c-file-ptr-stream.cc src/input.cc src/mex.cc src/oct-fstrm.cc src/oct-parse.yy |
| diffstat | 17 files changed, 28 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/ChangeLog +++ b/liboctave/ChangeLog @@ -1,3 +1,9 @@ +2010-03-25 John W. Eaton <jwe@octave.org> + + * cmd-edit.cc, file-ops.cc, lo-math.h, lo-utils.cc, oct-env.cc, + dir-ops.cc, file-stat.cc, cmd-hist.cc, oct-time.cc, oct-time.h, + oct-uname.cc: Revert changes from 2010-03-24 and 2010-03-25. + 2010-03-25 Jaroslav Hajek <highegg@gmail.com> * lo-mappers.cc
--- a/liboctave/cmd-edit.cc +++ b/liboctave/cmd-edit.cc @@ -25,8 +25,8 @@ #include <config.h> #endif -#include "stdlib.h" -#include "string.h" +#include <cstdlib> +#include <cstring> #include <string>
--- a/liboctave/cmd-hist.cc +++ b/liboctave/cmd-hist.cc @@ -25,7 +25,7 @@ #include <config.h> #endif -#include "string.h" +#include <cstring> #include <iostream> #include <string>
--- a/liboctave/dir-ops.cc +++ b/liboctave/dir-ops.cc @@ -30,7 +30,6 @@ #include <list> #include <string> -#include "string.h" #include "sysdir.h"
--- a/liboctave/file-ops.cc +++ b/liboctave/file-ops.cc @@ -26,9 +26,9 @@ #endif #include <cerrno> -#include "stdio.h" -#include "stdlib.h" -#include "string.h" +#include <cstdio> +#include <cstdlib> +#include <cstring> #include <iostream> #include <vector>
--- a/liboctave/file-stat.cc +++ b/liboctave/file-stat.cc @@ -26,7 +26,7 @@ #endif #include <cerrno> -#include "string.h" +#include <cstring> #include <sys/types.h> #include <unistd.h>
--- a/liboctave/lo-math.h +++ b/liboctave/lo-math.h @@ -24,14 +24,13 @@ #define octave_liboctave_math_h 1 #if defined (__cplusplus) -#include "math.h" #include <cmath> // if #undef log2 is missing in cmath, undef it here #if defined (log2) #undef log2 #endif #else -#include "math.h" +#include <math.h> #endif #if defined (HAVE_SUNMATH_H)
--- a/liboctave/lo-utils.cc +++ b/liboctave/lo-utils.cc @@ -27,7 +27,7 @@ #endif #include <cctype> -#include "stdlib.h" +#include <cstdlib> #include <cstdio> #include <cstring>
--- a/liboctave/oct-env.cc +++ b/liboctave/oct-env.cc @@ -43,7 +43,7 @@ #include <cctype> #include <cstdlib> -#include "string.h" +#include <cstring> #include <string>
--- a/liboctave/oct-time.cc +++ b/liboctave/oct-time.cc @@ -25,7 +25,7 @@ #endif #include <climits> -#include "time.h" +#include <ctime> #include <sys/time.h> #include <sys/types.h>
--- a/liboctave/oct-uname.cc +++ b/liboctave/oct-uname.cc @@ -25,7 +25,7 @@ #endif #include <cerrno> -#include "string.h" +#include <cstring> #ifdef HAVE_SYS_UTSNAME_H #include <sys/utsname.h>
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2010-03-25 John W. Eaton <jwe@octave.org> + + * oct-parse.yy, oct-fstrm.cc, mex.cc, input.cc, + c-file-ptr-stream.cc: Revert changes from 2010-03-24. + 2010-03-25 Jaroslav Hajek <highegg@gmail.com> * kron.cc (Fkron): Completely rewrite.
--- a/src/c-file-ptr-stream.cc +++ b/src/c-file-ptr-stream.cc @@ -26,7 +26,6 @@ #endif #include <iostream> -#include "stdio.h" #include "c-file-ptr-stream.h"
--- a/src/input.cc +++ b/src/input.cc @@ -27,7 +27,7 @@ #include <config.h> #endif -#include "stdio.h" +#include <cstdio> #include <cstdlib> #include <cstring> #include <cassert>
--- a/src/mex.cc +++ b/src/mex.cc @@ -25,7 +25,7 @@ #include <cfloat> #include <csetjmp> #include <cstdarg> -#include "stdlib.h" +#include <cstdlib> #include <cstring> #include <cctype>