diff options
author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2006-09-05 18:03:25 -0400 |
---|---|---|
committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2006-09-05 18:03:25 -0400 |
commit | 0b81fccd2ee4e054e5cffb739de07460ff2c13f7 (patch) | |
tree | cd754982e30fc37bf8f36cd5dd873b07b278eb4e /include | |
parent | 20c4ac6e038607ebbf6c04639670514c016d8597 (diff) | |
parent | c2813514cf7b1a36caa848cbc2ceef99cf2eb769 (diff) |
Merge branch 'master' into my-XACE-modular
Conflicts:
configure.ac
Diffstat (limited to 'include')
-rw-r--r-- | include/dix-config.h.in | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 3481c779f..571a86719 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -222,6 +222,9 @@ /* Support IPv6 for TCP connections */ #undef IPv6 +/* Support os-specific local connections */ +#undef LOCALCONN + /* Support MIT Misc extension */ #undef MITMISC |