[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109042: Move some AIX defines from s
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109042: Move some AIX defines from src/s to configure |
Date: |
Wed, 11 Jul 2012 21:18:45 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109042
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-07-11 21:18:45 -0400
message:
Move some AIX defines from src/s to configure
* configure.ac (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGPOLL)
(BROKEN_SIGPTY): Move here from src/s.
* src/s/aix4-2.h (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGPTY)
(BROKEN_SIGPOLL): Let configure set them.
* src/s/syssignal.h: Comment fix.
modified:
ChangeLog
configure.ac
src/ChangeLog
src/s/aix4-2.h
src/syssignal.h
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-12 01:14:56 +0000
+++ b/ChangeLog 2012-07-12 01:18:45 +0000
@@ -3,7 +3,8 @@
* configure.ac (NO_MATHERR): Unconditionally define for Darwin;
as src/s/darwin.h used to.
- * configure.ac (NARROWPROTO, NO_ABORT): Move here from src/s.
+ * configure.ac (NARROWPROTO, NO_ABORT, BROKEN_FIONREAD, BROKEN_SIGAIO):
+ (BROKEN_SIGPOLL, BROKEN_SIGPTY): Move here from src/s.
2012-07-11 Glenn Morris <address@hidden>
=== modified file 'configure.ac'
--- a/configure.ac 2012-07-12 01:14:56 +0000
+++ b/configure.ac 2012-07-12 01:18:45 +0000
@@ -3152,13 +3152,27 @@
;;
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
+ 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>.
hpux* | irix6-5 | openbsd | sol2* | unixware )
AC_DEFINE(BROKEN_SIGIO, 1, [Define if SIGIO should not be used.])
;;
+ aix4-2)
+ dnl BUILD 9008 - FIONREAD problem still exists in X-Windows.
+ AC_DEFINE(BROKEN_FIONREAD, 1, [Define if FIONREAD should not be used.])
+ dnl As we define BROKEN_FIONREAD, SIGIO will be undefined in systty.h.
+ dnl But, on AIX, SIGAIO, SIGPTY, and SIGPOLL are defined as SIGIO,
+ dnl which causes compilation error at init_signals in sysdep.c.
+ dnl So, we define these macros so that syssignal.h detects them
+ dnl and undefine SIGAIO, SIGPTY and SIGPOLL.
+ AC_DEFINE(BROKEN_SIGAIO, 1, [Define if SIGAIO should not be used.])
+ AC_DEFINE(BROKEN_SIGPOLL,1, [Define if SIGPOLL should not be used.])
+ AC_DEFINE(BROKEN_SIGPTY, 1, [Define if SIGPTY should not be used.])
+ ;;
+
dnl Define the following so emacs symbols will not conflict with those
dnl in the System framework. Otherwise -prebind will not work.
darwin)
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-07-12 01:14:56 +0000
+++ b/src/ChangeLog 2012-07-12 01:18:45 +0000
@@ -1,6 +1,9 @@
2012-07-12 Glenn Morris <address@hidden>
- * s/darwin.h (NO_ABORT, NO_MATHERR): Let configure set it.
+ * s/aix4-2.h (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGPTY)
+ (BROKEN_SIGPOLL): Let configure set them.
+
+ * s/darwin.h (NO_ABORT, NO_MATHERR): Let configure set them.
* s/bsd-common.h, s/cygwin.h, s/gnu-linux.h, s/irix6-5.h:
* s/template.h: Move NARROWPROTO to configure.
=== modified file 'src/s/aix4-2.h'
--- a/src/s/aix4-2.h 2012-07-11 23:40:59 +0000
+++ b/src/s/aix4-2.h 2012-07-12 01:18:45 +0000
@@ -60,17 +60,6 @@
to avoid a crash just use the Emacs implementation for that function. */
#define BROKEN_GET_CURRENT_DIR_NAME 1
-/*** BUILD 9008 - FIONREAD problem still exists in X-Windows. ***/
-#define BROKEN_FIONREAD
-/* As we define BROKEN_FIONREAD, SIGIO will be undefined in systty.h.
- But, on AIX, SIGAIO, SIGPTY, and SIGPOLL are defined as SIGIO,
- which causes compilation error at init_signals in sysdep.c. So, we
- define these macros so that syssignal.h detects them and undefine
- SIGAIO, SIGPTY and SIGPOLL. */
-#define BROKEN_SIGAIO
-#define BROKEN_SIGPTY
-#define BROKEN_SIGPOLL
-
/* Conservative garbage collection has not been tested, so for now
play it safe and stick with the old-fashioned way of marking. */
#define GC_MARK_STACK GC_USE_GCPROS_AS_BEFORE
=== modified file 'src/syssignal.h'
--- a/src/syssignal.h 2012-06-24 17:39:14 +0000
+++ b/src/syssignal.h 2012-07-12 01:18:45 +0000
@@ -86,15 +86,13 @@
#if defined (SIGIO) && defined (BROKEN_SIGIO)
# undef SIGIO
#endif
-/* Last user: m/ibmrs6000.h */
+/* These are only used by AIX */
#if defined (SIGPOLL) && defined (BROKEN_SIGPOLL)
#undef SIGPOLL
#endif
-/* Last user: m/ibmrs6000.h */
#if defined (SIGAIO) && defined (BROKEN_SIGAIO)
#undef SIGAIO
#endif
-/* Last user: m/ibmrs6000.h */
#if defined (SIGPTY) && defined (BROKEN_SIGPTY)
#undef SIGPTY
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109042: Move some AIX defines from src/s to configure,
Glenn Morris <=