aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorEli Zaretskii2010-03-20 07:14:01 -0400
committerEli Zaretskii2010-03-20 07:14:01 -0400
commitf2cdb04ac04fb8f9f92bce11df6e4a020720208b (patch)
tree4d231ff66e4145ce8967ed0c4ab71b364d05675f /admin
parent8eef7665fa98baae93da5151c27ca0db4d1d6f5b (diff)
parent22e8757456ea6608246d9c81a83f6c5119f2e1fb (diff)
downloademacs-f2cdb04ac04fb8f9f92bce11df6e4a020720208b.tar.gz
emacs-f2cdb04ac04fb8f9f92bce11df6e4a020720208b.zip
Merge from mainline.
Diffstat (limited to 'admin')
-rw-r--r--admin/CPP-DEFINES2
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/CPP-DEFINES b/admin/CPP-DEFINES
index 9e656c39aa1..3c69e9e6a4a 100644
--- a/admin/CPP-DEFINES
+++ b/admin/CPP-DEFINES
@@ -299,7 +299,7 @@ PTY_TTY_NAME_SPRINTF
299PURESIZE 299PURESIZE
300RUN_TIME_REMAP 300RUN_TIME_REMAP
301SA_RESTART 301SA_RESTART
302SECTION_ALIGNMENT 302SECTION_ALIGNMENT -- was only used by s/lynxos.h, maybe all code depending on it can be removed.
303SEGMENT_MASK 303SEGMENT_MASK
304SETPGRP_RELEASES_CTTY 304SETPGRP_RELEASES_CTTY
305SETUP_SLAVE_PTY 305SETUP_SLAVE_PTY