3 files changed, 5 insertions, 7 deletions

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 3c69e9e6a4a..7ab0c3f52a4 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -75,9 +75,6 @@ NO_REMAP
 VIRT_ADDR_VARIES
 WORDS_BIG_ENDIAN
 
-** Not used anymore by any port, can be cleaned up
-NO_SOCK_SIGIO
-
 ** Misc macros
 USER_FULL_NAME   If defined, overrides the default pw->pw_gecos for getting at the full user name.  Only MSDOS overrides the default.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index c65767d8fc4..ab47c2cab02 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-22  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * keyboard.c (Fset_input_interrupt_mode): Remove code depending on
+        NO_SOCK_SIGIO, not used anymore.
+
 2010-03-21  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * m/vax.h (BSD_SYSTEM, BSD4_2): Remove conditionals, we only
diff --git a/src/keyboard.c b/src/keyboard.c
index 48d39235e3f..6582af7f805 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -11304,11 +11304,7 @@ See also `current-input-mode'.  */)
     {
       /* When using X, don't give the user a real choice,
          because we haven't implemented the mechanisms to support it.  */
-#ifdef NO_SOCK_SIGIO
-      new_interrupt_input = 0;
-#else /* not NO_SOCK_SIGIO */
       new_interrupt_input = 1;
-#endif /* NO_SOCK_SIGIO */
     }
   else
 #endif /* HAVE_X_WINDOWS */