From: Glenn Morris <rgm@gnu.org>
Date: Thu, 12 Jul 2012 01:11:37 +0000 (-0400)
Subject: Move setting of NO_MATHERR for Darwin from src/s to configure
X-Git-Tag: emacs-24.2.90~1199^2~47
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=51c3b9b4b89de5a7ab0c54d5b3e89c28b80527d0;p=emacs.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 2d048599672..92ef76d4ef7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-07-12  Glenn Morris  <rgm@gnu.org>
 
+	* 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  <rgm@gnu.org>
diff --git a/configure.ac b/configure.ac
index 1f053a6e713..d33e08fadfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1266,7 +1266,9 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]],
 [[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
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 494f3c89861..abb9c7bdca9 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-12  Glenn Morris  <rgm@gnu.org>
 
+	* 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.
 
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 472f1854219..9e6016cc206 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -82,9 +82,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* 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