diff options
author | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2005-05-25 11:01:01 +0000 |
commit | e88de75a1a236779a10e8ccbcc51d25308be8840 (patch) | |
tree | 7495477a2a7d0cac17a9fcded020b6ea816182ef /acconfig.h | |
parent | 30a0f9443782cd9d7308acd09430bf586186aa55 (diff) | |
parent | 5d05471f6657646d1d6500c7c43134462c407ee6 (diff) |
Merge 4.0p1 to the trunk.
Diffstat (limited to 'acconfig.h')
-rw-r--r-- | acconfig.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/acconfig.h b/acconfig.h index 014413505..5721f65fb 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: acconfig.h,v 1.180 2004/08/16 13:12:06 dtucker Exp $ */ | 1 | /* $Id: acconfig.h,v 1.181 2005/02/25 23:07:38 dtucker Exp $ */ |
2 | 2 | ||
3 | /* | 3 | /* |
4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. | 4 | * Copyright (c) 1999-2003 Damien Miller. All rights reserved. |
@@ -52,9 +52,6 @@ | |||
52 | #undef SPT_TYPE | 52 | #undef SPT_TYPE |
53 | #undef SPT_PADCHAR | 53 | #undef SPT_PADCHAR |
54 | 54 | ||
55 | /* setgroups() NOOP allowed */ | ||
56 | #undef SETGROUPS_NOOP | ||
57 | |||
58 | /* SCO workaround */ | 55 | /* SCO workaround */ |
59 | #undef BROKEN_SYS_TERMIO_H | 56 | #undef BROKEN_SYS_TERMIO_H |
60 | 57 | ||