diff options
| author | Glenn Morris | 2012-07-11 21:14:56 -0400 |
|---|---|---|
| committer | Glenn Morris | 2012-07-11 21:14:56 -0400 |
| commit | c5564388a3d737538a48a202b9668cefa776794d (patch) | |
| tree | aaa24f9b1e6efe00cbb89e48d0aa45aff759e697 /src | |
| parent | 51c3b9b4b89de5a7ab0c54d5b3e89c28b80527d0 (diff) | |
| download | emacs-c5564388a3d737538a48a202b9668cefa776794d.tar.gz emacs-c5564388a3d737538a48a202b9668cefa776794d.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/s/darwin.h | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index abb9c7bdca9..f53b9a212c8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | 2012-07-12 Glenn Morris <rgm@gnu.org> | 1 | 2012-07-12 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * s/darwin.h (NO_MATHERR): Let configure set it. | 3 | * s/darwin.h (NO_ABORT, NO_MATHERR): Let configure set it. |
| 4 | 4 | ||
| 5 | * s/bsd-common.h, s/cygwin.h, s/gnu-linux.h, s/irix6-5.h: | 5 | * s/bsd-common.h, s/cygwin.h, s/gnu-linux.h, s/irix6-5.h: |
| 6 | * s/template.h: Move NARROWPROTO to configure. | 6 | * s/template.h: Move NARROWPROTO to configure. |
diff --git a/src/s/darwin.h b/src/s/darwin.h index 9e6016cc206..548e3b4779e 100644 --- a/src/s/darwin.h +++ b/src/s/darwin.h | |||
| @@ -76,12 +76,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 76 | #undef HAVE_POSIX_MEMALIGN | 76 | #undef HAVE_POSIX_MEMALIGN |
| 77 | #endif | 77 | #endif |
| 78 | 78 | ||
| 79 | /* Define the following so emacs symbols will not conflict with those | ||
| 80 | in the System framework. Otherwise -prebind will not work. */ | ||
| 81 | |||
| 82 | /* Do not define abort in emacs.c. */ | ||
| 83 | #define NO_ABORT | ||
| 84 | |||
| 85 | /* The following solves the problem that Emacs hangs when evaluating | 79 | /* The following solves the problem that Emacs hangs when evaluating |
| 86 | (make-comint "test0" "/nodir/nofile" nil "") when /nodir/nofile | 80 | (make-comint "test0" "/nodir/nofile" nil "") when /nodir/nofile |
| 87 | does not exist. Also, setsid is not allowed in the vfork child's | 81 | does not exist. Also, setsid is not allowed in the vfork child's |