[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109041: Move NO_ABORT from src/s to
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109041: Move NO_ABORT from src/s to configure |
Date: |
Wed, 11 Jul 2012 21:14:56 -0400 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109041
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-07-11 21:14:56 -0400
message:
Move NO_ABORT from src/s to configure
* configure.ac (NO_ABORT): Move here from src/s.
* src/s/darwin.h (NO_ABORT): Let configure set it.
modified:
ChangeLog
configure.ac
src/ChangeLog
src/s/darwin.h
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-12 01:11:37 +0000
+++ b/ChangeLog 2012-07-12 01:14:56 +0000
@@ -3,7 +3,7 @@
* configure.ac (NO_MATHERR): Unconditionally define for Darwin;
as src/s/darwin.h used to.
- * configure.ac (NARROWPROTO): Move here from src/s.
+ * configure.ac (NARROWPROTO, NO_ABORT): Move here from src/s.
2012-07-11 Glenn Morris <address@hidden>
=== modified file 'configure.ac'
--- a/configure.ac 2012-07-12 01:11:37 +0000
+++ b/configure.ac 2012-07-12 01:14:56 +0000
@@ -3157,7 +3157,13 @@
case $opsys in
hpux* | irix6-5 | openbsd | sol2* | unixware )
AC_DEFINE(BROKEN_SIGIO, 1, [Define if SIGIO 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)
+ AC_DEFINE(NO_ABORT, 1, [Do not define abort in emacs.c.])
+ ;;
esac
case $opsys in
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-07-12 01:11:37 +0000
+++ b/src/ChangeLog 2012-07-12 01:14:56 +0000
@@ -1,6 +1,6 @@
2012-07-12 Glenn Morris <address@hidden>
- * s/darwin.h (NO_MATHERR): Let configure set it.
+ * s/darwin.h (NO_ABORT, NO_MATHERR): Let configure set it.
* 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/darwin.h'
--- a/src/s/darwin.h 2012-07-12 01:11:37 +0000
+++ b/src/s/darwin.h 2012-07-12 01:14:56 +0000
@@ -76,12 +76,6 @@
#undef HAVE_POSIX_MEMALIGN
#endif
-/* Define the following so emacs symbols will not conflict with those
- in the System framework. Otherwise -prebind will not work. */
-
-/* Do not define abort in emacs.c. */
-#define NO_ABORT
-
/* The following solves the problem that Emacs hangs when evaluating
(make-comint "test0" "/nodir/nofile" nil "") when /nodir/nofile
does not exist. Also, setsid is not allowed in the vfork child's
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109041: Move NO_ABORT from src/s to configure,
Glenn Morris <=