2 files changed, 6 insertions, 5 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index cf6ffee2c63..834695d6c78 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -91,10 +91,6 @@ BROKEN_GET_CURRENT_DIR_NAME
 BROKEN_NON_BLOCKING_CONNECT
 BROKEN_PTY_READ_AFTER_EAGAIN
 BROKEN_SA_RESTART
-BROKEN_SIGAIO
-BROKEN_SIGIO
-BROKEN_SIGPOLL
-BROKEN_SIGPTY
 CLASH_DETECTION
 DATA_SEG_BITS
 DATA_START
@@ -423,7 +419,6 @@ MAIL_USE_SYSTEM_LOCK
 MAXPATHLEN
 NLIST_STRUCT
 NO_EDITRES
-NO_TERMIO
 NSIG
 NSIG_MINIMUM
 NULL_DEVICE
diff --git a/admin/ChangeLog b/admin/ChangeLog
index b70067d7465..25eed8af5e3 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,9 @@
+2012-09-13  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Simplify SIGIO usage (Bug#12408).
+        * CPP_DEFINES (BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL)
+        (BROKEN_SIGPTY, NO_TERMIO): Remove.
+
 2012-09-11  Paul Eggert  <eggert@cs.ucla.edu>
 
         Simplify, document, and port floating-point (Bug#12381).