Merge from emacs-24; up to 2014-03-24T03:06:35Z!dancol@dancol.org

[bpt/emacs.git] / admin / CPP-DEFINES

diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 27d87dc..8bfe2ca 100644 (file)
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -86,7 +86,6 @@ BROKEN_FIONREAD
 BROKEN_GET_CURRENT_DIR_NAME
 BROKEN_NON_BLOCKING_CONNECT
 BROKEN_PTY_READ_AFTER_EAGAIN
-CLASH_DETECTION
 DATA_SEG_BITS
 DEFAULT_SOUND_DEVICE
 DEVICE_SEP