2 files changed, 5 insertions, 1 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index be73d1a9bf5..d87feb9b866 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -428,7 +428,6 @@ MAIL_USE_POP
 MAIL_USE_SYSTEM_LOCK
 MAXPATHLEN
 NLIST_STRUCT
-NO_ABORT
 NO_EDITRES
 NO_MATHERR
 NO_TERMIO
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 145028ec815..54fea2615fd 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,8 @@
+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.