Remove headers for functions found in liblbxutil

As reported in https://bugs.freedesktop.org/show_bug.cgi?id=25880
they were already added to liblbxutil, but I missed removing them
from here, where they're not used.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

4 files changed, 0 insertions, 250 deletions

diff --git a/include/X11/extensions/lbxbuf.h b/include/X11/extensions/lbxbuf.h
deleted file mode 100644
index 63983df..0000000
--- a/include/X11/extensions/lbxbuf.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* $Xorg: lbxbuf.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/*
- * Copyright 1988, 1989, 1990, 1994 Network Computing Devices, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name Network Computing Devices, Inc. not be
- * used in advertising or publicity pertaining to distribution of this 
- * software without specific, written prior permission.
- * 
- * THIS SOFTWARE IS PROVIDED `AS-IS'.  NETWORK COMPUTING DEVICES, INC.,
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT
- * LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE, OR NONINFRINGEMENT.  IN NO EVENT SHALL NETWORK
- * COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING
- * SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE,
- * DATA, OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND
- * REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * 
- */
-
-#ifndef _BUFFER_H_
-#define _BUFFER_H_
-
-#define INBUFFER_SIZE		(1 << 13)	/* 8K */
-#define OUTBUFFER_SIZE		(1 << 12)	/* 4K */
-
-#ifndef TRUE
-#define TRUE    1
-#endif
-#ifndef FALSE
-#define FALSE   0
-#endif
-
-typedef struct _zlibbuffer  *ZlibBufferPtr;
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-extern int  InitZlibBuffer(ZlibBufferPtr b, int size);
-extern void FreeZlibBuffer(ZlibBufferPtr b);
-extern char *ReserveOutBuf(ZlibBufferPtr outbuf, int outlen);
-
-_XFUNCPROTOEND
-
-#endif	/* _BUFFER_H_ */
diff --git a/include/X11/extensions/lbxbufstr.h b/include/X11/extensions/lbxbufstr.h
deleted file mode 100644
index e1a06f6..0000000
--- a/include/X11/extensions/lbxbufstr.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* $Xorg: lbxbufstr.h,v 1.3 2000/08/18 04:05:45 coskrey Exp $ */
-/*
- * Copyright 1988, 1989, 1990, 1994 Network Computing Devices, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software and
- * its documentation for any purpose is hereby granted without fee, provided
- * that the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name Network Computing Devices, Inc. not be
- * used in advertising or publicity pertaining to distribution of this 
- * software without specific, written prior permission.
- * 
- * THIS SOFTWARE IS PROVIDED `AS-IS'.  NETWORK COMPUTING DEVICES, INC.,
- * DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING WITHOUT
- * LIMITATION ALL IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE, OR NONINFRINGEMENT.  IN NO EVENT SHALL NETWORK
- * COMPUTING DEVICES, INC., BE LIABLE FOR ANY DAMAGES WHATSOEVER, INCLUDING
- * SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES, INCLUDING LOSS OF USE,
- * DATA, OR PROFITS, EVEN IF ADVISED OF THE POSSIBILITY THEREOF, AND
- * REGARDLESS OF WHETHER IN AN ACTION IN CONTRACT, TORT OR NEGLIGENCE,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * 
- */
-/* $XFree86$ */
-
-#ifndef _BUFFERSTR_H_
-#define _BUFFERSTR_H_
-
-#include <X11/extensions/lbxbuf.h>
-
-/*
- * ZLIB Input/Output buffer
- */
-typedef struct _zlibbuffer {
-	char 	*bufbase;
-	char	*bufend;
-	char	*bufptr;
-	int  	bufcnt;
-} ZlibBuffer;
-
-#define BYTES_AVAIL(inbuf, len)	\
-	(((inbuf)->bufcnt >= (len)) ? (inbuf)->bufptr : NULL)
-
-#endif	/* _BUFFERSTR_H_ */
diff --git a/include/X11/extensions/lbximage.h b/include/X11/extensions/lbximage.h
deleted file mode 100644
index 10627cf..0000000
--- a/include/X11/extensions/lbximage.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/* $Xorg: lbximage.h,v 1.4 2001/02/09 02:03:24 xorgcvs Exp $ */
-
-/******************************************************************************
-
-Copyright 1994, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-******************************************************************************/
-/* $XFree86: xc/include/extensions/lbximage.h,v 1.4 2001/12/20 19:28:54 tsi Exp $ */
-
-#ifndef _LBX_IMAGE_H_
-#define _LBX_IMAGE_H_
-
-#include <X11/Xfuncproto.h>
-
-_XFUNCPROTOBEGIN
-
-typedef struct _LbxBitmapCompMethod {
-
-    char *methodName;
-    int inited;
-    int methodOpCode;	/* to be filled on reply from server */
-
-    int (*compInit)(
-	void
-    );
-
-    int (*compFunc)(
-	unsigned char *		/* inbuf */,
-	unsigned char *		/* outbuf */,
-	int			/* outbufSize */,
-	int			/* image_bytes */,
-	int			/* pixels_per_line */,
-	int			/* padded_bytes_per_scanline */,
-	int			/* reverse_bits */,
-	int *			/* bytesCompressed */
-    );
-
-    int (*decompFunc)(
-	unsigned char *		/* inbuf */,
-	unsigned char *		/* outbuf */,
-	int			/* image_bytes */,
-	int			/* pixels_per_line */,
-	int			/* padded_bytes_per_scanline */,
-	int			/* reverse_bits */
-    );
-
-} LbxBitmapCompMethod;
-
-
-#define LBX_MAX_DEPTHS 5
-
-typedef struct _LbxPixmapCompMethod {
-
-    char *methodName;
-    unsigned formatMask;
-    int depthCount;
-    int depths[LBX_MAX_DEPTHS];
-    int inited;
-    int methodOpCode;	/* to be filled on reply from server */
-
-    int (*compInit)(
-	void
-    );
-
-    int (*compFunc)(
-	char *			/* inbuf */,
-	char *			/* outbuf */,
-	int			/* outbufSize */,
-	int			/* format */,
-	int			/* depth */,
-	int			/* num_scan_lines */,
-	int			/* scan_line_size */,
-	int *			/* bytesCompressed */
-    );
-
-    int (*decompFunc)(
-	char *			/* inbuf */,
-	char *			/* outbuf */,
-	int			/* num_scan_lines */,
-	int			/* scan_line_size */
-    );
-
-} LbxPixmapCompMethod;
-
-
-extern int LbxImageEncodePackBits (
-char *			/* inbuf */,
-char *			/* outbuf */,
-int			/* outbufSize */,
-int			/* format */,
-int			/* depth */,
-int			/* num_scan_lines */,
-int			/* scan_line_size */,
-int *			/* bytesCompressed */
-);
-
-extern int LbxImageEncodeFaxG42D (
-unsigned char *		/* inbuf */,
-unsigned char *		/* outbuf */,
-int			/* outbufSize */,
-int			/* image_bytes */,
-int			/* pixels_per_line */,
-int			/* padded_bytes_per_scanline */,
-int			/* reverse_bits */,
-int *			/* bytesCompressed */
-);
-
-extern int LbxImageDecodePackBits (
-char *			/* inbuf */,
-char *			/* outbuf */,
-int			/* num_scan_lines */,
-int			/* scan_line_size */
-);
-
-extern int LbxImageDecodeFaxG42D (
-unsigned char *		/* inbuf */,
-unsigned char *		/* outbuf */,
-int			/* image_bytes */,
-int			/* pixels_per_line */,
-int			/* padded_bytes_per_scanline */,
-int			/* reverse_bits */
-);
-
-_XFUNCPROTOEND
-
-#define LBX_IMAGE_COMPRESS_SUCCESS		0
-#define LBX_IMAGE_COMPRESS_NO_SUPPORT		1
-#define LBX_IMAGE_COMPRESS_BAD_MALLOC		2
-#define LBX_IMAGE_COMPRESS_NOT_WORTH_IT		3
-
-#endif /* _LBX_IMAGE_H_ */
diff --git a/src/Makefile.am b/src/Makefile.am
index b9b43f7..6e34bb9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,9 +32,6 @@ libXext_la_SOURCES = \
 libXextincludedir = $(includedir)/X11/extensions
 libXextinclude_HEADERS = $(top_srcdir)/include/X11/extensions/dpms.h \
 			 $(top_srcdir)/include/X11/extensions/extutil.h \
-			 $(top_srcdir)/include/X11/extensions/lbxbuf.h \
-			 $(top_srcdir)/include/X11/extensions/lbxbufstr.h \
-			 $(top_srcdir)/include/X11/extensions/lbximage.h \
 			 $(top_srcdir)/include/X11/extensions/MITMisc.h \
 			 $(top_srcdir)/include/X11/extensions/multibuf.h \
 			 $(top_srcdir)/include/X11/extensions/security.h \