# HG changeset patch
# User jwe
# Date 949569592 0
# Node ID 4b1a93f832642c304fb69ccf7960a7359d3eeb0a
# Parent  4290f11c8d3b1b91ab96e49738ecc9d4353c1964
[project @ 2000-02-03 09:19:49 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/help.cc b/src/help.cc
--- a/src/help.cc
+++ b/src/help.cc
@@ -24,7 +24,6 @@
 #include <config.h>
 #endif
 
-#include <csignal>
 #include <cstdlib>
 #include <cstring>
 
diff --git a/src/input.cc b/src/input.cc
--- a/src/input.cc
+++ b/src/input.cc
@@ -30,7 +30,6 @@
 #include <cstdlib>
 #include <cstring>
 #include <cassert>
-#include <csignal>
 
 #include <iostream>
 #include <string>
diff --git a/src/oct-hist.cc b/src/oct-hist.cc
--- a/src/oct-hist.cc
+++ b/src/oct-hist.cc
@@ -35,7 +35,6 @@
 #include <config.h>
 #endif
 
-#include <csignal>
 #include <cstdlib>
 #include <cstring>
 
diff --git a/src/octave.cc b/src/octave.cc
--- a/src/octave.cc
+++ b/src/octave.cc
@@ -27,7 +27,6 @@
 #endif
 
 #include <cassert>
-#include <csignal>
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
diff --git a/src/pager.cc b/src/pager.cc
--- a/src/pager.cc
+++ b/src/pager.cc
@@ -24,8 +24,6 @@
 #include <config.h>
 #endif
 
-#include <csignal>
-
 #include <fstream>
 #include <string>
 
diff --git a/src/pt-plot.h b/src/pt-plot.h
--- a/src/pt-plot.h
+++ b/src/pt-plot.h
@@ -42,8 +42,6 @@
 
 class tree_walker;
 
-#include <csignal>
-
 #include <string>
 
 #include <SLList.h>
diff --git a/src/sighandlers.cc b/src/sighandlers.cc
--- a/src/sighandlers.cc
+++ b/src/sighandlers.cc
@@ -25,7 +25,6 @@
 #endif
 
 #include <cstdlib>
-#include <csignal>
 
 #include <iostream>
 #include <new>
diff --git a/src/sighandlers.h b/src/sighandlers.h
--- a/src/sighandlers.h
+++ b/src/sighandlers.h
@@ -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
diff --git a/src/toplev.cc b/src/toplev.cc
--- a/src/toplev.cc
+++ b/src/toplev.cc
@@ -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"
diff --git a/src/utils.cc b/src/utils.cc
--- a/src/utils.cc
+++ b/src/utils.cc
@@ -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)