[xlibs-commit] X11/include/X11 Xlibint.h,3.27,3.27.2.1

[Jamey Sharp]

Committed by: jamey

Update of /cvs/xlibs/X11/include/X11
In directory pdx:/tmp/cvs-serv11074/include/X11

Modified Files:
      Tag: XCL
	Xlibint.h 
Log Message:
Landed XCL patches on the XCL branch. Removed a ton of code, replacing
it with calls into XCB. Tested on a variety of applications, window
managers, and display managers. Another patch to make it run on Solaris
will land soon; I haven't tested it much yet.

Note that this removes libXdmcp, which kdm on Debian - at least -
assumes is linked into Xlib. I worked around this with the obvious
LD_PRELOAD.


Index: Xlibint.h
===================================================================
RCS file: /cvs/xlibs/X11/include/X11/Xlibint.h,v
retrieving revision 3.27
retrieving revision 3.27.2.1
diff -u -d -r3.27 -r3.27.2.1
--- Xlibint.h	27 May 2003 22:26:26 -0000	3.27
+++ Xlibint.h	13 Nov 2003 19:28:34 -0000	3.27.2.1
@@ -187,6 +187,7 @@
 	int xcmisc_opcode;	/* major opcode for XC-MISC */
 	struct _XkbInfoRec *xkb_info; /* XKB info */
 	struct _XtransConnInfo *trans_conn; /* transport connection object */
+	struct XCLPrivate *xcl;	/* XCB glue private data */
 };
 
 #define XAllocIDs(dpy,ids,n) (*(dpy)->idlist_alloc)(dpy,ids,n)
@@ -223,7 +224,6 @@
 #define _SGI_MP_SOURCE  /* turn this on to get MP safe errno */
 #endif
 #include <errno.h>
-#define _XBCOPYFUNC _Xbcopy
 #include <X11/Xfuncs.h>
 #include <X11/Xosdefs.h>