upstream

2 files changed, 11 insertions, 6 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index be73d1a9bf5..b40ba78e20d 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -107,7 +107,6 @@ EMACS_CONFIGURATION
 EMACS_CONFIG_OPTIONS
 EMACS_INT
 EMACS_UINT
-FLOAT_CHECK_DOMAIN
 GC_MARK_SECONDARY_STACK
 GC_MARK_STACK
 GC_SETJMP_WORKS
@@ -158,12 +157,10 @@ HAVE_ENDPWENT
 HAVE_ENVIRON_DECL
 HAVE_EUIDACCESS
 HAVE_FCNTL_H
-HAVE_FMOD
 HAVE_FORK
 HAVE_FPATHCONF
 HAVE_FREEIFADDRS
 HAVE_FREETYPE
-HAVE_FREXP
 HAVE_FSEEKO
 HAVE_FSYNC
 HAVE_FUTIMENS
@@ -217,7 +214,6 @@ HAVE_IFADDRS_H
 HAVE_IMAGEMAGICK
 HAVE_INET_SOCKETS
 HAVE_INTTYPES_H
-HAVE_INVERSE_HYPERBOLIC
 HAVE_JPEG
 HAVE_KERBEROSIV_DES_H
 HAVE_KERBEROSIV_KRB_H
@@ -428,9 +424,7 @@ MAIL_USE_POP
 MAIL_USE_SYSTEM_LOCK
 MAXPATHLEN
 NLIST_STRUCT
-NO_ABORT
 NO_EDITRES
-NO_MATHERR
 NO_TERMIO
 NSIG
 NSIG_MINIMUM
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 145028ec815..2c61f437981 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,14 @@
+2012-09-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Assume C89 or later for math functions (Bug#12381).
+        * CPP-DEFINES (HAVE_FMOD, HAVE_FREXP, FLOAT_CHECK_DOMAIN)
+        (HAVE_INVERSE_HYPERBOLIC, NO_MATHERR): Remove.
+
+2012-09-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify redefinition of 'abort' (Bug#12316).
+        * CPP-DEFINES (NO_ABORT): Remove.
+
 2012-08-28  Glenn Morris  <rgm@gnu.org>
 
         * bzrmerge.el (bzrmerge-merges): Allow unversioned files in the tree.