5 files changed, 10 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 775b95f4626..8ef1837ada7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,7 +4,7 @@
         (opsysfile): Set to empty on netbsd, openbsd.
         (AH_BOTTOM): Include signal.h if SIGNAL_H_AHB is defined.
 
-        * configure.ac (_longjmp, _setjmp): Move here from src/s.
+        * configure.ac (_longjmp, _setjmp, TIOCSIGSEND): Move here from src/s.
 
 2012-07-30  Jan Djärv  <jan.h.d@swipnet.se>
 
diff --git a/configure.ac b/configure.ac
index 77eab0821eb..23833f4913c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3631,12 +3631,17 @@ else
   esac
 fi                              dnl GCC?
 
+
 case $opsys in
   sol2* | unixware )
     dnl setjmp and longjmp can safely replace _setjmp and _longjmp,
     dnl but they will run more slowly.
     AC_DEFINE(_setjmp, setjmp, [Some platforms redefine this.])
     AC_DEFINE(_longjmp, longjmp, [Some platforms redefine this.])
+    dnl TIOCGPGRP is broken in SysVr4, so we can't send signals to PTY
+    dnl subprocesses the usual way.  But TIOCSIGNAL does work for PTYs,
+    dnl and this is all we need.
+    AC_DEFINE(TIOCSIGSEND, TIOCSIGNAL, [Some platforms redefine this.])
     ;;
 esac
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 076b5eb1cce..907b54d614f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -3,8 +3,10 @@
         * s/netbsd.h: Let configure include signal.h if needed.
         Remove file, which is now empty.
 
-        * s/usg5-4-common.h (_longjmp, _setjmp): Let configure set them.
-        * s/irix6-5.h (_longjmp, _setjmp): No more need to undefine.
+        * s/usg5-4-common.h (_longjmp, _setjmp, TIOCSIGSEND):
+        Let configure set them.
+        * s/irix6-5.h (_longjmp, _setjmp, TIOCSIGSEND):
+        No more need to undefine.
 
 2012-07-30  Andreas Schwab  <schwab@linux-m68k.org>
 
diff --git a/src/s/irix6-5.h b/src/s/irix6-5.h
index 1750183189d..338c18cca52 100644
--- a/src/s/irix6-5.h
+++ b/src/s/irix6-5.h
@@ -24,6 +24,3 @@ char *_getpty();
 #endif
 
 #undef SA_RESTART     /* not the same as defining BROKEN_SA_RESTART */
-
-#undef TIOCSIGSEND              /* defined in usg5-4-common.h */
-
diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 12506bd8d08..05f22143460 100644
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -42,8 +42,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
   waitpid ((pid_t) -1, (status), (options))
 #define WRETCODE(w) (w >> 8)
 
-/* TIOCGPGRP is broken in SysVr4, so we can't send signals to PTY
-   subprocesses the usual way.  But TIOCSIGNAL does work for PTYs, and
-   this is all we need.  */
-#define TIOCSIGSEND TIOCSIGNAL
-