Rename lbx.h to lbxproxy.h to avoid conflict with new lbx.h in xextproto 7.1

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

23 files changed, 27 insertions, 27 deletions

diff --git a/Makefile.am b/Makefile.am
index a66b895..d0e0262 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,7 +65,7 @@ lbxproxy_SOURCES = \
 	include/colormap.h	\
 	include/init.h		\
 	include/lbxext.h	\
-	include/lbx.h		\
+	include/lbxproxy.h	\
 	include/misc.h		\
 	include/os.h		\
 	include/pm.h		\
diff --git a/di/cmap.c b/di/cmap.c
index 3a499a7..643baee 100644
--- a/di/cmap.c
+++ b/di/cmap.c
@@ -54,7 +54,7 @@ from The Open Group.
 #include	<stdio.h>
 #include	"assert.h"
 #include	"misc.h"
-#include	"lbx.h"
+#include	"lbxproxy.h"
 #include	"atomcache.h"
 #include	"util.h"
 #include	"tags.h"
diff --git a/di/cmaputil.c b/di/cmaputil.c
index e408aa0..b7cada4 100644
--- a/di/cmaputil.c
+++ b/di/cmaputil.c
@@ -52,7 +52,7 @@ from The Open Group.
 
 #include	<stdio.h>
 #include	"misc.h"
-#include	"lbx.h"
+#include	"lbxproxy.h"
 #include	"assert.h"
 #include	"colormap.h"
 #include	"util.h"
diff --git a/di/dispatch.c b/di/dispatch.c
index 919d1cc..5388342 100644
--- a/di/dispatch.c
+++ b/di/dispatch.c
@@ -25,7 +25,7 @@
 
 #include <stdio.h>
 #include "assert.h"
-#include "lbx.h"
+#include "lbxproxy.h"
 #include "wire.h"
 #include "swap.h"
 #include "lbxext.h"
diff --git a/di/extensions.c b/di/extensions.c
index f8c0de9..b5ab1e1 100644
--- a/di/extensions.c
+++ b/di/extensions.c
@@ -49,7 +49,7 @@ in this Software without prior written authorization from The Open Group.
 
 /* tracks server extensions */
 
-#include	"lbx.h"
+#include	"lbxproxy.h"
 #include	"assert.h"
 #include	"wire.h"
 #include	"lbxext.h"
diff --git a/di/gfx.c b/di/gfx.c
index 58f3fb1..f94f81c 100644
--- a/di/gfx.c
+++ b/di/gfx.c
@@ -55,7 +55,7 @@ in this Software without prior written authorization from The Open Group.
 #include	<stdio.h>
 #include	"assert.h"
 #include	"misc.h"
-#include	"lbx.h"
+#include	"lbxproxy.h"
 #include	"util.h"
 #include	"resource.h"
 #include	"wire.h"
diff --git a/di/globals.c b/di/globals.c
index 51843bb..cf1f3de 100644
--- a/di/globals.c
+++ b/di/globals.c
@@ -47,7 +47,7 @@ SOFTWARE.
 ********************************************************/
   
 #include "misc.h"
-#include "lbx.h"
+#include "lbxproxy.h"
 
 ClientPtr *clients;
 int  currentMaxClients;   /* current size of clients array */
diff --git a/di/lbxfuncs.c b/di/lbxfuncs.c
index 97b793f..808e39d 100644
--- a/di/lbxfuncs.c
+++ b/di/lbxfuncs.c
@@ -40,7 +40,7 @@
 
 #include	<stdio.h>
 #include	"assert.h"
-#include	"lbx.h"
+#include	"lbxproxy.h"
 #include	"atomcache.h"
 #include	"util.h"
 #include	"init.h"
diff --git a/di/lbxutil.c b/di/lbxutil.c
index 93cf923..5bb0c4b 100644
--- a/di/lbxutil.c
+++ b/di/lbxutil.c
@@ -31,7 +31,7 @@
 #include	<stdio.h>
 #include	"misc.h"
 #include	"assert.h"
-#include	"lbx.h"
+#include	"lbxproxy.h"
 #include	"util.h"
 #include	"tags.h"
 #include	"resource.h"
diff --git a/di/main.c b/di/main.c
index c8bdba3..fa2f0d0 100644
--- a/di/main.c
+++ b/di/main.c
@@ -48,7 +48,7 @@ in this Software without prior written authorization from The Open Group.
 /* $XFree86: xc/programs/lbxproxy/di/main.c,v 1.8 2001/01/21 21:19:39 tsi Exp $ */
 
 #include <stdlib.h>
-#include "lbx.h"
+#include "lbxproxy.h"
 #include "wire.h"
 #include "atomcache.h"
 #include "colormap.h"
diff --git a/di/props.c b/di/props.c
index b0a2669..bad81a0 100644
--- a/di/props.c
+++ b/di/props.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
 #include	<stdio.h>
 #include	"misc.h"
 #include	"assert.h"
-#include	"lbx.h"
+#include	"lbxproxy.h"
 #include	"util.h"
 #include	"tags.h"
 #include	"resource.h"
diff --git a/di/resource.c b/di/resource.c
index 1bf1179..f491682 100644
--- a/di/resource.c
+++ b/di/resource.c
@@ -79,7 +79,7 @@ SOFTWARE.
 #include "misc.h"
 #include "os.h"
 #include "resource.h" 
-#include "lbx.h" 
+#include "lbxproxy.h"
 #include "colormap.h"
 #include "wire.h"
 
diff --git a/di/swaprep.c b/di/swaprep.c
index 763eb00..1e93848 100644
--- a/di/swaprep.c
+++ b/di/swaprep.c
@@ -51,7 +51,7 @@ in this Software without prior written authorization from The Open Group.
 #include	<stdio.h>
 #include	"misc.h"
 #include	"assert.h"
-#include	"lbx.h"
+#include	"lbxproxy.h"
 #include	"swap.h"
 
 void
diff --git a/di/swapreq.c b/di/swapreq.c
index 09ca0f5..4214247 100644
--- a/di/swapreq.c
+++ b/di/swapreq.c
@@ -51,7 +51,7 @@ in this Software without prior written authorization from The Open Group.
 #include	<stdio.h>
 #include	"misc.h"
 #include	"assert.h"
-#include	"lbx.h"
+#include	"lbxproxy.h"
 #include	"swap.h"
 
 /* Byte swap a list of longs */
diff --git a/di/tables.c b/di/tables.c
index 49c7532..d946acb 100644
--- a/di/tables.c
+++ b/di/tables.c
@@ -26,7 +26,7 @@
 #include "util.h"
 #include <X11/Xlibint.h>
 #include <X11/Xutil.h>
-#include "lbx.h"
+#include "lbxproxy.h"
 
 int (*InitialVector[3])(ClientPtr) =
 {
diff --git a/di/unsquish.c b/di/unsquish.c
index 33f72bd..976178f 100644
--- a/di/unsquish.c
+++ b/di/unsquish.c
@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
 #define	_XLBX_SERVER_
 #include <X11/extensions/lbxstr.h>
 #include "proxyopts.h"
-#include "lbx.h"
+#include "lbxproxy.h"
 
 #include	<stdio.h>
 
diff --git a/di/utils.c b/di/utils.c
index 5df8c06..2e04c18 100644
--- a/di/utils.c
+++ b/di/utils.c
@@ -52,7 +52,7 @@ SOFTWARE.
 # include "config.h"
 #endif
 
-#include "lbx.h"
+#include "lbxproxy.h"
 #include <stdio.h>
 #include <stdlib.h>		/* getenv(), {m,re}alloc() */
 #ifdef X_POSIX_C_SOURCE
diff --git a/di/wire.c b/di/wire.c
index 44a73df..b463a0a 100644
--- a/di/wire.c
+++ b/di/wire.c
@@ -47,7 +47,7 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $XFree86: xc/programs/lbxproxy/di/wire.c,v 1.14 2002/09/19 13:22:03 tsi Exp $ */
 
-#include "lbx.h"
+#include "lbxproxy.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include "wire.h"
diff --git a/di/zeropad.c b/di/zeropad.c
index 14ff08b..7fc8d9f 100644
--- a/di/zeropad.c
+++ b/di/zeropad.c
@@ -35,7 +35,7 @@ from The Open Group.
  */
 
 #include <X11/Xproto.h>
-#include "lbx.h"
+#include "lbxproxy.h"
 #include "lbxext.h"
 
 static void
diff --git a/include/lbx.h b/include/lbxproxy.h
index 18cf905..4defa9f 100644
--- a/include/lbx.h
+++ b/include/lbxproxy.h
@@ -1,4 +1,4 @@
-/* $Xorg: lbx.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */
+/* $Xorg: lbxproxy.h,v 1.4 2001/02/09 02:05:32 xorgcvs Exp $ */
 /*
 
 Copyright 1996, 1998  The Open Group
@@ -45,10 +45,10 @@ in this Software without prior written authorization from The Open Group.
  * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  */
-/* $XFree86: xc/programs/lbxproxy/include/lbx.h,v 1.6 2001/12/14 20:00:55 dawes Exp $ */
+/* $XFree86: xc/programs/lbxproxy/include/lbxproxy.h,v 1.6 2001/12/14 20:00:55 dawes Exp $ */
 
-#ifndef _LBX_H_
-#define _LBX_H_
+#ifndef _LBXPROXY_H_
+#define _LBXPROXY_H_
 #include "misc.h"
 #include "os.h"
 #include "util.h"
diff --git a/include/wire.h b/include/wire.h
index eb4f26a..16ffac5 100644
--- a/include/wire.h
+++ b/include/wire.h
@@ -47,12 +47,12 @@ in this Software without prior written authorization from The Open Group.
  */
 /* $XFree86: xc/programs/lbxproxy/include/wire.h,v 1.7 2001/12/14 20:00:56 dawes Exp $ */
 
-#ifdef DEBUG 		/* Need this here because lbx.h undef's DEBUG */
+#ifdef DEBUG 		/* Need this here because lbxproxy.h undef's DEBUG */
 extern int lbxDebug;
 #endif
 
 #include "misc.h"
-#include "lbx.h"
+#include "lbxproxy.h"
 #include <X11/extensions/lbxdeltastr.h>
 #include <X11/extensions/lbximage.h>
 #include "proxyopts.h"
diff --git a/os/connection.c b/os/connection.c
index cbb3721..550af6b 100644
--- a/os/connection.c
+++ b/os/connection.c
@@ -104,7 +104,7 @@ SOFTWARE.
 #include <X11/Xpoll.h>
 #include "osdep.h"
 #include "os.h"
-#include "lbx.h"
+#include "lbxproxy.h"
 #include "util.h"
 #include "pm.h"
 #include "wire.h"
diff --git a/os/io.c b/os/io.c
index c879a7c..659ab3a 100644
--- a/os/io.c
+++ b/os/io.c
@@ -65,7 +65,7 @@ SOFTWARE.
 #include "os.h"
 #include <X11/Xpoll.h>
 #include "osdep.h"
-#include "lbx.h"
+#include "lbxproxy.h"
 
 #ifdef BIGREQS
 #include <X11/extensions/bigreqstr.h>