[Emacs-diffs] /srv/bzr/emacs/trunk r109040: Move setting of NO_MATHERR for Darwin from src/s to configure

[Glenn Morris]

------------------------------------------------------------
revno: 109040
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2012-07-11 21:11:37 -0400
message:
  Move setting of NO_MATHERR for Darwin from src/s to configure
  
  * configure.ac (NO_MATHERR): Unconditionally define for Darwin;
  as src/s/darwin.h used to.
  
  * src/s/darwin.h (NO_MATHERR): Let configure set it.
modified:
  ChangeLog
  configure.ac
  src/ChangeLog
  src/s/darwin.h

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-07-12 00:49:24 +0000
+++ b/ChangeLog 2012-07-12 01:11:37 +0000
@@ -1,5 +1,8 @@
 2012-07-12  Glenn Morris  <address@hidden>
 
+       * configure.ac (NO_MATHERR): Unconditionally define for Darwin;
+       as src/s/darwin.h used to.
+
        * configure.ac (NARROWPROTO): Move here from src/s.
 
 2012-07-11  Glenn Morris  <address@hidden>

=== modified file 'configure.ac'
--- a/configure.ac      2012-07-12 00:49:24 +0000
+++ b/configure.ac      2012-07-12 01:11:37 +0000
@@ -1266,7 +1266,9 @@
 [[static struct exception x; x.arg1 = x.arg2 = x.retval; x.name = ""; x.type = 
1;]])],
   emacs_cv_struct_exception=yes, emacs_cv_struct_exception=no))
 HAVE_EXCEPTION=$emacs_cv_struct_exception
-if test $emacs_cv_struct_exception != yes; then
+dnl Define on Darwin so emacs symbols will not conflict with those
+dnl in the System framework.  Otherwise -prebind will not work.
+if test $emacs_cv_struct_exception != yes || test $opsys = darwin; then
   AC_DEFINE(NO_MATHERR, 1, [Define to 1 if you don't have struct exception in 
math.h.])
 fi
 

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-07-12 00:49:24 +0000
+++ b/src/ChangeLog     2012-07-12 01:11:37 +0000
@@ -1,5 +1,7 @@
 2012-07-12  Glenn Morris  <address@hidden>
 
+       * s/darwin.h (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-11 23:40:59 +0000
+++ b/src/s/darwin.h    2012-07-12 01:11:37 +0000
@@ -82,9 +82,6 @@
 /* Do not define abort in emacs.c.  */
 #define NO_ABORT
 
-/* Do not define matherr in floatfns.c.  */
-#define NO_MATHERR
-
 /* 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