aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/Xintconn.h
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-06-11 15:12:35 +0000
committermarha <marha@users.sourceforge.net>2010-06-11 15:12:35 +0000
commitbb9571d3ede4adbb9396fdb25ab8e3e91aba1479 (patch)
tree8e21e43376a5b106a5d9689a4349385101263325 /libX11/src/Xintconn.h
parentd1e4f4b8546c7955c66dd023bfd6ef437db9d21d (diff)
parentf56cfbb54588917d9566277a669fa086a842b2f5 (diff)
downloadvcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.tar.gz
vcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.tar.bz2
vcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.zip
svn merge ^/branches/released .
Diffstat (limited to 'libX11/src/Xintconn.h')
-rw-r--r--libX11/src/Xintconn.h51
1 files changed, 14 insertions, 37 deletions
diff --git a/libX11/src/Xintconn.h b/libX11/src/Xintconn.h
index ee975ac44..c51e3c721 100644
--- a/libX11/src/Xintconn.h
+++ b/libX11/src/Xintconn.h
@@ -1,37 +1,14 @@
-
-#ifndef _XINTCONN_H_
-#define _XINTCONN_H_ 1
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-#if !USE_XCB
-/* ConnDis.c */
-
-int _XConnectDisplay (
- char *display_name,
- char **fullnamep, /* RETURN */
- int *dpynump, /* RETURN */
- int *screenp, /* RETURN */
- char **auth_namep, /* RETURN */
- int *auth_namelenp, /* RETURN */
- char **auth_datap, /* RETURN */
- int *auth_datalenp); /* RETURN */
-extern int _XDisconnectDisplay(XtransConnInfo trans_conn);
-extern Bool _XSendClientPrefix(Display *dpy, xConnClientPrefix *client,
- char *auth_proto, char *auth_string,
- xConnSetupPrefix *prefix);
-extern XtransConnInfo _X11TransConnectDisplay(char *display_name,
- char **fullnamep, int *dpynump,
- int *screenp, char **auth_namep,
- int *auth_namelenp, char **auth_datap,
- int *auth_datalenp);
-#endif /* !USE_XCB */
-
-/* OpenDis.c */
-extern void _XFreeDisplayStructure(Display *dpy);
-
-_XFUNCPROTOEND
-
-#endif /* _XINTCONN_H_ */
+
+#ifndef _XINTCONN_H_
+#define _XINTCONN_H_ 1
+
+#include <X11/Xfuncproto.h>
+
+_XFUNCPROTOBEGIN
+
+/* OpenDis.c */
+extern void _XFreeDisplayStructure(Display *dpy);
+
+_XFUNCPROTOEND
+
+#endif /* _XINTCONN_H_ */