Mercurial > octave-nkf
changeset 3566:4b1a93f83264
[project @ 2000-02-03 09:19:49 by jwe]
| author | jwe |
|---|---|
| date | Thu, 03 Feb 2000 09:19:52 +0000 |
| parents | 4290f11c8d3b |
| children | dd8998699aa8 |
| files | src/ChangeLog src/help.cc src/input.cc src/oct-hist.cc src/octave.cc src/pager.cc src/pt-plot.h src/sighandlers.cc src/sighandlers.h src/toplev.cc src/utils.cc |
| diffstat | 11 files changed, 32 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Feb 03 08:32:44 2000 +0000 +++ b/src/ChangeLog Thu Feb 03 09:19:52 2000 +0000 @@ -1,5 +1,21 @@ 2000-02-03 John W. Eaton <jwe@bevo.che.wisc.edu> + * sighandlers.h: Include signal.h here. + * sighandlers.cc: Not here. + + * utils.cc: Include setjmp.h, not csetjmp. + * toplev.cc: Ditto. + + * sighandlers.cc: Include signal.h, not csignal. + + * pt-plot.h: Don't include csignal. + * toplev.cc: Ditto. + * oct-hist.cc: Ditto. + * octave.cc: Ditto. + * pager.cc: Ditto. + * input.cc: Ditto. + * help.cc: Ditto. + * pt-plot.cc (send_to_plot_stream): Use operator== and substr method to do limited-length string comparison. * input.cc (generate_completion): Likewise.
--- a/src/help.cc Thu Feb 03 08:32:44 2000 +0000 +++ b/src/help.cc Thu Feb 03 09:19:52 2000 +0000 @@ -24,7 +24,6 @@ #include <config.h> #endif -#include <csignal> #include <cstdlib> #include <cstring>
--- a/src/input.cc Thu Feb 03 08:32:44 2000 +0000 +++ b/src/input.cc Thu Feb 03 09:19:52 2000 +0000 @@ -30,7 +30,6 @@ #include <cstdlib> #include <cstring> #include <cassert> -#include <csignal> #include <iostream> #include <string>
--- a/src/oct-hist.cc Thu Feb 03 08:32:44 2000 +0000 +++ b/src/oct-hist.cc Thu Feb 03 09:19:52 2000 +0000 @@ -35,7 +35,6 @@ #include <config.h> #endif -#include <csignal> #include <cstdlib> #include <cstring>
--- a/src/octave.cc Thu Feb 03 08:32:44 2000 +0000 +++ b/src/octave.cc Thu Feb 03 09:19:52 2000 +0000 @@ -27,7 +27,6 @@ #endif #include <cassert> -#include <csignal> #include <cstdlib> #include <cstring> #include <ctime>
--- a/src/pager.cc Thu Feb 03 08:32:44 2000 +0000 +++ b/src/pager.cc Thu Feb 03 09:19:52 2000 +0000 @@ -24,8 +24,6 @@ #include <config.h> #endif -#include <csignal> - #include <fstream> #include <string>
--- a/src/pt-plot.h Thu Feb 03 08:32:44 2000 +0000 +++ b/src/pt-plot.h Thu Feb 03 09:19:52 2000 +0000 @@ -42,8 +42,6 @@ class tree_walker; -#include <csignal> - #include <string> #include <SLList.h>
--- a/src/sighandlers.cc Thu Feb 03 08:32:44 2000 +0000 +++ b/src/sighandlers.cc Thu Feb 03 09:19:52 2000 +0000 @@ -25,7 +25,6 @@ #endif #include <cstdlib> -#include <csignal> #include <iostream> #include <new>
--- a/src/sighandlers.h Thu Feb 03 08:32:44 2000 +0000 +++ b/src/sighandlers.h Thu Feb 03 09:19:52 2000 +0000 @@ -33,11 +33,16 @@ #if !defined (octave_sighandlers_h) #define octave_sighandlers_h 1 -#include <Array.h> +// Include signal.h, not csignal since the latter might only define +// the ANSI standard C signal interface. + +#include <signal.h> #include "syswait.h" #include "siglist.h" +#include <Array.h> + // Signal handler return type. #ifndef RETSIGTYPE #define RETSIGTYPE void
--- a/src/toplev.cc Thu Feb 03 08:32:44 2000 +0000 +++ b/src/toplev.cc Thu Feb 03 09:19:52 2000 +0000 @@ -25,8 +25,6 @@ #endif #include <cassert> -#include <csetjmp> -#include <csignal> #include <cstdlib> #include <cstring> @@ -42,6 +40,11 @@ #include <unistd.h> #endif +// Include setjmp.h, not csetjmp since the latter might only define +// the ANSI standard C interface. + +#include <setjmp.h> + #include "cmd-edit.h" #include "file-ops.h" #include "lo-error.h"
--- a/src/utils.cc Thu Feb 03 08:32:44 2000 +0000 +++ b/src/utils.cc Thu Feb 03 09:19:52 2000 +0000 @@ -25,7 +25,6 @@ #endif #include <climits> -#include <csetjmp> #include <cstring> #include <fstream> @@ -40,6 +39,11 @@ #include <unistd.h> #endif +// Include setjmp.h, not csetjmp since the latter might only define +// the ANSI standard C interface. + +#include <setjmp.h> + #if defined (HAVE_TERMIOS_H) #include <termios.h> #elif defined (HAVE_TERMIO_H)