[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r108578: Move NO_TERMIO, BROKEN_SIGIO
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r108578: Move NO_TERMIO, BROKEN_SIGIO from src/s to configure |
Date: |
Tue, 12 Jun 2012 13:43:09 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 108578
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-06-12 13:43:09 -0400
message:
Move NO_TERMIO, BROKEN_SIGIO from src/s to configure
* configure.in (NO_TERMIO, BROKEN_SIGIO): New AC_DEFINEs.
* src/s/bsd-common.h, src/s/darwin.h, src/s/gnu-kfreebsd.h, src/s/hpux10-20.h:
Remove NO_TERMIO.
* src/s/hpux10-20.h, src/s/openbsd.h, src/s/usg5-4-common.h:
Remove BROKEN_SIGIO.
modified:
ChangeLog
configure.in
src/ChangeLog
src/s/bsd-common.h
src/s/darwin.h
src/s/gnu-kfreebsd.h
src/s/hpux10-20.h
src/s/openbsd.h
src/s/usg5-4-common.h
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-06-12 17:27:41 +0000
+++ b/ChangeLog 2012-06-12 17:43:09 +0000
@@ -6,6 +6,8 @@
2012-06-12 Glenn Morris <address@hidden>
+ * configure.in (NO_TERMIO, BROKEN_SIGIO): Move here from src/s.
+
* configure.in: Anticipate platforms with no src/s file.
2012-06-12 Chong Yidong <address@hidden>
=== modified file 'configure.in'
--- a/configure.in 2012-06-12 17:27:41 +0000
+++ b/configure.in 2012-06-12 17:43:09 +0000
@@ -3111,6 +3111,20 @@
dnl AC_DEFINE(HAVE_TCATTR, 1, [Define to 1 if you have tcgetattr and
tcsetattr.])
dnl fi
+case $opsys in
+ darwin | gnu | hpux* | *bsd )
+ AC_DEFINE(NO_TERMIO, 1, [Define if termio.h should not be included.])
+ ;;
+esac
+
+dnl SIGIO exists, but the feature doesn't work in the way Emacs needs.
+dnl See eg <http://article.gmane.org/gmane.os.openbsd.ports/46831>.
+case $opsys in
+ hpux* | irix6-5 | openbsd | sol2* | unixware )
+ AC_DEFINE(BROKEN_SIGIO, 1, [Define if SIGIO should not be used.])
+ ;;
+esac
+
# Set up the CFLAGS for real compilation, so we can substitute it.
CFLAGS="$REAL_CFLAGS"
CPPFLAGS="$REAL_CPPFLAGS"
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-06-12 10:08:39 +0000
+++ b/src/ChangeLog 2012-06-12 17:43:09 +0000
@@ -1,3 +1,11 @@
+2012-06-12 Glenn Morris <address@hidden>
+
+ * s/hpux10-20.h, s/openbsd.h, s/usg5-4-common.h:
+ Move BROKEN_SIGIO to configure.
+
+ * s/bsd-common.h, s/darwin.h, s/gnu-kfreebsd.h, s/hpux10-20.h:
+ Move NO_TERMIO to configure.
+
2012-06-12 Chong Yidong <address@hidden>
* image.c (imagemagick_load_image): Use MagickFlattenImage if
=== modified file 'src/s/bsd-common.h'
--- a/src/s/bsd-common.h 2012-06-11 23:17:11 +0000
+++ b/src/s/bsd-common.h 2012-06-12 17:43:09 +0000
@@ -37,8 +37,6 @@
#define TABDLY OXTABS
#define TAB3 OXTABS
-#define NO_TERMIO
-
/* If the system's imake configuration file defines `NeedWidePrototypes'
as `NO', we must define NARROWPROTO manually. Such a define is
generated in the Makefile generated by `xmkmf'. If we don't
=== modified file 'src/s/darwin.h'
--- a/src/s/darwin.h 2012-06-11 23:17:11 +0000
+++ b/src/s/darwin.h 2012-06-12 17:43:09 +0000
@@ -58,8 +58,6 @@
if system supports pty's. 'a' means it is /dev/ptya0 */
#define FIRST_PTY_LETTER 'p'
-#define NO_TERMIO
-
/* Define HAVE_PTYS if the system supports pty devices.
Note: PTYs are broken on darwin <6. Use at your own risk. */
#define HAVE_PTYS
=== modified file 'src/s/gnu-kfreebsd.h'
--- a/src/s/gnu-kfreebsd.h 2012-06-11 23:17:11 +0000
+++ b/src/s/gnu-kfreebsd.h 2012-06-12 17:43:09 +0000
@@ -1,3 +1,2 @@
#include "gnu-linux.h"
-#define NO_TERMIO /* use only <termios.h> */
=== modified file 'src/s/hpux10-20.h'
--- a/src/s/hpux10-20.h 2012-06-11 23:17:11 +0000
+++ b/src/s/hpux10-20.h 2012-06-12 17:43:09 +0000
@@ -30,8 +30,6 @@
if system supports pty's. 'p' means it is /dev/ptym/ptyp0 */
#define FIRST_PTY_LETTER 'p'
-#define NO_TERMIO
-
/* Define HAVE_PTYS if the system supports pty devices. */
#define HAVE_PTYS
@@ -45,10 +43,6 @@
/* Special hacks needed to make Emacs run on this system. */
-/* In hpux, the symbol SIGIO is defined, but the feature
- doesn't work in the way Emacs needs it to. */
-#define BROKEN_SIGIO
-
/* Some additional system facilities exist. */
#define HAVE_PERROR /* Delete this line for version 6. */
=== modified file 'src/s/openbsd.h'
--- a/src/s/openbsd.h 2011-07-19 17:33:06 +0000
+++ b/src/s/openbsd.h 2012-06-12 17:43:09 +0000
@@ -3,7 +3,3 @@
/* Nearly the same as NetBSD. Note there are differences in configure. */
#include "netbsd.h"
-/* The symbol SIGIO is defined, but the feature doesn't work in the
- way Emacs needs it to. See
- <http://article.gmane.org/gmane.os.openbsd.ports/46831>. */
-#define BROKEN_SIGIO
=== modified file 'src/s/usg5-4-common.h'
--- a/src/s/usg5-4-common.h 2012-06-11 23:17:11 +0000
+++ b/src/s/usg5-4-common.h 2012-06-12 17:43:09 +0000
@@ -35,8 +35,7 @@
#define HAVE_SYSV_SIGPAUSE
/* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars.
- But get <termio.h> first to make sure ttold.h doesn't interfere.
- And don't try to use SIGIO yet. */
+ But get <termio.h> first to make sure ttold.h doesn't interfere. */
#include <sys/wait.h>
#ifdef emacs
@@ -47,7 +46,6 @@
#include <sys/stream.h>
#include <sys/stropts.h>
#include <sys/termios.h>
-#define BROKEN_SIGIO
#endif
/* Some SVr4s don't define NSIG in sys/signal.h for ANSI environments;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r108578: Move NO_TERMIO, BROKEN_SIGIO from src/s to configure,
Glenn Morris <=