Mercurial > octave
changeset 1350:5f63d83dd694
[project @ 1995-09-05 07:37:59 by jwe]
| author | jwe |
|---|---|
| date | Tue, 05 Sep 1995 07:47:12 +0000 |
| parents | 33cf1f36aec6 |
| children | 8256c4c57419 |
| files | liboctave/tempname.c src/file-io.cc src/help.cc src/input.cc src/oct-hist.cc src/pt-exp-base.cc src/pt-misc.cc src/pt-plot.cc src/sighandlers.cc src/sysdep.cc src/utils.cc src/variables.cc |
| diffstat | 12 files changed, 44 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/tempname.c Tue Sep 05 07:09:38 1995 +0000 +++ b/liboctave/tempname.c Tue Sep 05 07:47:12 1995 +0000 @@ -22,14 +22,17 @@ #ifndef HAVE_TEMPNAM -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif #include <errno.h> #include <stddef.h> #include <stdio.h> #include <stdlib.h> #include <string.h> + +#ifdef HAVE_UNISTD_H +#include <sys/types.h> +#include <unistd.h> +#endif + #include <fcntl.h> #include "statdefs.h"
--- a/src/file-io.cc Tue Sep 05 07:09:38 1995 +0000 +++ b/src/file-io.cc Tue Sep 05 07:47:12 1995 +0000 @@ -39,19 +39,20 @@ #include <cstdlib> #include <cctype> +#include <strstream.h> + +#ifdef HAVE_UNISTD_H #include <sys/types.h> -#ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#include <sys/wait.h> + #include <fcntl.h> -#include <strstream.h> - #include <DLList.h> #include "dMatrix.h" +#include "syswait.h" #include "statdefs.h" #include "file-io.h" #include "input.h"
--- a/src/help.cc Tue Sep 05 07:09:38 1995 +0000 +++ b/src/help.cc Tue Sep 05 07:47:12 1995 +0000 @@ -29,14 +29,14 @@ #include <cstdlib> #include <cstring> +#include <iostream.h> +#include <strstream.h> + +#ifdef HAVE_UNISTD_H #include <sys/types.h> -#ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#include <iostream.h> -#include <strstream.h> - #include "tree-expr.h" #include "tree-const.h" #include "sighandlers.h"
--- a/src/input.cc Tue Sep 05 07:09:38 1995 +0000 +++ b/src/input.cc Tue Sep 05 07:47:12 1995 +0000 @@ -47,12 +47,13 @@ #include <iostream.h> #include <strstream.h> +#ifdef HAVE_UNISTD_H #include <sys/types.h> -#ifdef HAVE_UNISTD_H #include <unistd.h> #endif // This must come before anything that includes iostream.h... +// (This is apparently no longer true...) extern "C" { #include "readline/readline.h" @@ -64,6 +65,7 @@ // Yes, this sucks, but it avoids a conflict with another readline // function declared in iostream.h. +// (Apparently, there isn't one there now...) #if 0 #define LINE_SIZE 8192
--- a/src/oct-hist.cc Tue Sep 05 07:09:38 1995 +0000 +++ b/src/oct-hist.cc Tue Sep 05 07:47:12 1995 +0000 @@ -36,15 +36,16 @@ #include <cstdlib> #include <cstring> +#include <fstream.h> +#include <strstream.h> + +#ifdef HAVE_UNISTD_H #include <sys/types.h> -#ifdef HAVE_UNISTD_H #include <unistd.h> #endif + #include <fcntl.h> -#include <fstream.h> -#include <strstream.h> - #include "statdefs.h" #include "utils.h" #include "error.h"
--- a/src/pt-exp-base.cc Tue Sep 05 07:09:38 1995 +0000 +++ b/src/pt-exp-base.cc Tue Sep 05 07:47:12 1995 +0000 @@ -34,14 +34,14 @@ #include <cstdio> #include <cstring> +#include <iostream.h> +#include <strstream.h> + +#ifdef HAVE_UNISTD_H #include <sys/types.h> -#ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#include <iostream.h> -#include <strstream.h> - #include "variables.h" #include "user-prefs.h" #include "dynamic-ld.h"
--- a/src/pt-misc.cc Tue Sep 05 07:09:38 1995 +0000 +++ b/src/pt-misc.cc Tue Sep 05 07:47:12 1995 +0000 @@ -29,13 +29,13 @@ #include <config.h> #endif +#include <iostream.h> + +#ifdef HAVE_UNISTD_H #include <sys/types.h> -#ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#include <iostream.h> - #include "error.h" #include "tree-base.h" #include "tree-expr.h"
--- a/src/pt-plot.cc Tue Sep 05 07:09:38 1995 +0000 +++ b/src/pt-plot.cc Tue Sep 05 07:47:12 1995 +0000 @@ -31,13 +31,14 @@ #include <cstring> +#include <fstream.h> +#include <iostream.h> +#include <strstream.h> + +#ifdef HAVE_UNISTD_H #include <sys/types.h> -#ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#include <iostream.h> -#include <strstream.h> -#include <fstream.h> #include "SLStack.h" #include "procstream.h"
--- a/src/sighandlers.cc Tue Sep 05 07:09:38 1995 +0000 +++ b/src/sighandlers.cc Tue Sep 05 07:47:12 1995 +0000 @@ -28,14 +28,14 @@ #include <csignal> #include <new> +#include <iostream.h> + +#ifdef HAVE_UNISTD_H #include <sys/types.h> -#ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#include <sys/wait.h> -#include <iostream.h> - +#include "syswait.h" #include "sighandlers.h" #include "octave.h" #include "error.h"
--- a/src/sysdep.cc Tue Sep 05 07:09:38 1995 +0000 +++ b/src/sysdep.cc Tue Sep 05 07:47:12 1995 +0000 @@ -40,8 +40,8 @@ #include <cstdlib> #include <cstring> +#ifdef HAVE_UNISTD_H #include <sys/types.h> -#ifdef HAVE_UNISTD_H #include <unistd.h> #endif
--- a/src/utils.cc Tue Sep 05 07:09:38 1995 +0000 +++ b/src/utils.cc Tue Sep 05 07:47:12 1995 +0000 @@ -33,8 +33,8 @@ #include <iostream.h> #include <strstream.h> +#ifdef HAVE_UNISTD_H #include <sys/types.h> -#ifdef HAVE_UNISTD_H #include <unistd.h> #endif
--- a/src/variables.cc Tue Sep 05 07:09:38 1995 +0000 +++ b/src/variables.cc Tue Sep 05 07:47:12 1995 +0000 @@ -28,11 +28,12 @@ #include <cfloat> #include <cstring> +#include <strstream.h> + +#ifdef HAVE_UNISTD_H #include <sys/types.h> -#ifdef HAVE_UNISTD_H #include <unistd.h> #endif -#include <strstream.h> #include "defaults.h" #include "version.h"