summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:39 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-26 22:48:39 +0000
commit7ade20539c4745c6b90837922ae94b09c74dc59d (patch)
tree185a0f3cd8524e31b9ee1f586ab2940a2b0605be
parentc86cd8709c76b92ab615f79071a1f5a597a69226 (diff)
merge latest (4.3.99.16) from XFree86 (vendor) branch
-rw-r--r--include/X11/Xdmcp.h8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/X11/Xdmcp.h b/include/X11/Xdmcp.h
index 67dc4fb..faf2af4 100644
--- a/include/X11/Xdmcp.h
+++ b/include/X11/Xdmcp.h
@@ -13,7 +13,7 @@
* without express or implied warranty.
*
*/
-/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.6 2001/12/19 21:37:31 dawes Exp $ */
+/* $XFree86: xc/lib/Xdmcp/Xdmcp.h,v 3.7 2003/07/09 15:27:29 tsi Exp $ */
#ifndef _XDMCP_H_
#define _XDMCP_H_
@@ -45,7 +45,11 @@ typedef enum {
XDM_COLLECT_BROADCAST_QUERY, XDM_COLLECT_INDIRECT_QUERY,
XDM_START_CONNECTION, XDM_AWAIT_REQUEST_RESPONSE,
XDM_AWAIT_MANAGE_RESPONSE, XDM_MANAGE, XDM_RUN_SESSION, XDM_OFF,
- XDM_AWAIT_USER_INPUT, XDM_KEEPALIVE, XDM_AWAIT_ALIVE_RESPONSE
+ XDM_AWAIT_USER_INPUT, XDM_KEEPALIVE, XDM_AWAIT_ALIVE_RESPONSE,
+#if defined(IPv6) && defined(AF_INET6)
+ XDM_MULTICAST, XDM_COLLECT_MULTICAST_QUERY,
+#endif
+ XDM_KEEP_ME_LAST
} xdmcp_states;
#ifdef NOTDEF