From 85539de01ceefaddac1dedd5859a379fdf6d54d0 Mon Sep 17 00:00:00 2001
From: Jamey Sharp <jamey@minilop.net>
Date: Mon, 25 Sep 2006 04:13:07 -0700
Subject: [PATCH] libxcb now installs header files in <xcb>, not <X11/XCB>.

---
 app/xte/xte.c     |  6 +++---
 dpms.c            |  4 ++--
 hypnomoire.c      |  4 ++--
 neko/xcbneko.c    | 10 +++++-----
 rendertest.c      |  6 +++---
 reply_formats.h   |  2 +-
 tests/flames.c    | 10 +++++-----
 tests/julia.c     |  8 ++++----
 tests/lissajoux.c |  8 ++++----
 xcb-test.c        |  4 ++--
 xcbdpyinfo.c      |  2 +-
 xcbrandr.c        |  8 ++++----
 xcbxf86dri.c      |  4 ++--
 xcbxvinfo.c       |  4 ++--
 14 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/app/xte/xte.c b/app/xte/xte.c
index 3a63f47..006b672 100644
--- a/app/xte/xte.c
+++ b/app/xte/xte.c
@@ -24,9 +24,9 @@
 
 #include <stdio.h>
 #define X_H   /* make sure we aren't using symbols from X.h */
-#include <X11/XCB/xcb.h>
-#include <X11/XCB/xcb_keysyms.h>
-#include <X11/XCB/xtest.h>
+#include <xcb/xcb.h>
+#include <xcb/xcb_keysyms.h>
+#include <xcb/xtest.h>
 #include <unistd.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/dpms.c b/dpms.c
index 822b124..94a38d9 100644
--- a/dpms.c
+++ b/dpms.c
@@ -4,8 +4,8 @@
  * for licensing information.
  */
 
-#include <X11/XCB/xcb.h>
-#include <X11/XCB/dpms.h>
+#include <xcb/xcb.h>
+#include <xcb/dpms.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/hypnomoire.c b/hypnomoire.c
index 0f98b23..b82caf0 100644
--- a/hypnomoire.c
+++ b/hypnomoire.c
@@ -4,8 +4,8 @@
  * for licensing information.
  */
 
-#include <X11/XCB/xcb.h>
-#include <X11/XCB/xcb_aux.h>
+#include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 #include "reply_formats.h"
 #include <math.h>
 #include <stdlib.h> /* for free(3) */
diff --git a/neko/xcbneko.c b/neko/xcbneko.c
index 9bc38fa..bb81f70 100644
--- a/neko/xcbneko.c
+++ b/neko/xcbneko.c
@@ -22,12 +22,12 @@
 #include <X11/keysym.h>
 #else
 #define X_H   /* make sure we aren't using symbols from X.h */
-#include <X11/XCB/xcb.h>
+#include <xcb/xcb.h>
 /*#include <X11/XCB/xcb_image.h>*/
-#include <X11/XCB/xcb_aux.h>		/* xcb_aux_get_screen_t */
-#include <X11/XCB/xcb_icccm.h>
-#include <X11/XCB/xcb_atom.h>		/* STRING atom */
-#include <X11/XCB/xcb_keysyms.h>
+#include <xcb/xcb_aux.h>		/* xcb_aux_get_screen_t */
+#include <xcb/xcb_icccm.h>
+#include <xcb/xcb_atom.h>		/* STRING atom */
+#include <xcb/xcb_keysyms.h>
 
 typedef enum { False, True } Bool;
 
diff --git a/rendertest.c b/rendertest.c
index 1955590..6a22f06 100644
--- a/rendertest.c
+++ b/rendertest.c
@@ -1,7 +1,7 @@
 
-#include <X11/XCB/xcb.h>
-#include <X11/XCB/xcb_aux.h>
-#include <X11/XCB/render.h>
+#include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
+#include <xcb/render.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/reply_formats.h b/reply_formats.h
index 612d83c..4795109 100644
--- a/reply_formats.h
+++ b/reply_formats.h
@@ -7,7 +7,7 @@
 #ifndef REPLY_FORMATS_H
 #define REPLY_FORMATS_H
 
-#include <X11/XCB/xcb.h>
+#include <xcb/xcb.h>
 
 int formatGetWindowAttributesReply(xcb_window_t wid, xcb_get_window_attributes_reply_t *reply);
 int formatGetGeometryReply(xcb_window_t wid, xcb_get_geometry_reply_t *reply);
diff --git a/tests/flames.c b/tests/flames.c
index 810dee5..0557d19 100644
--- a/tests/flames.c
+++ b/tests/flames.c
@@ -26,11 +26,11 @@
 #include <string.h>
 
 #define X_H
-#include <X11/XCB/xcb.h>
-#include <X11/XCB/shm.h>
-#include <X11/XCB/xcb_aux.h>
-#include <X11/XCB/xcb_image.h>
-#include <X11/XCB/xcb_icccm.h>
+#include <xcb/xcb.h>
+#include <xcb/shm.h>
+#include <xcb/xcb_aux.h>
+#include <xcb/xcb_image.h>
+#include <xcb/xcb_icccm.h>
 
 /* some defines for the flame */
 #define HSPREAD 26
diff --git a/tests/julia.c b/tests/julia.c
index 089267f..27d6823 100644
--- a/tests/julia.c
+++ b/tests/julia.c
@@ -1,10 +1,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <X11/XCB/xcb.h>
-#include <X11/XCB/shm.h>
-#include <X11/XCB/xcb_aux.h>
-#include <X11/XCB/xcb_image.h>
+#include <xcb/xcb.h>
+#include <xcb/shm.h>
+#include <xcb/xcb_aux.h>
+#include <xcb/xcb_image.h>
 
 #include "julia.h"
 
diff --git a/tests/lissajoux.c b/tests/lissajoux.c
index 0bd1bf9..d512fcd 100644
--- a/tests/lissajoux.c
+++ b/tests/lissajoux.c
@@ -8,10 +8,10 @@
 #include <sys/ipc.h>
 #include <sys/shm.h>
 
-#include <X11/XCB/xcb.h>
-#include <X11/XCB/shm.h>
-#include <X11/XCB/xcb_aux.h>
-#include <X11/XCB/xcb_image.h>
+#include <xcb/xcb.h>
+#include <xcb/shm.h>
+#include <xcb/xcb_aux.h>
+#include <xcb/xcb_image.h>
 
 #include "lissajoux.h"
 
diff --git a/xcb-test.c b/xcb-test.c
index 90eeeaf..6d4b604 100644
--- a/xcb-test.c
+++ b/xcb-test.c
@@ -22,8 +22,8 @@
 
 #include <stdlib.h>
 
-#include <X11/XCB/xcb.h>
-#include <X11/XCB/xcb_aux.h>
+#include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
 #include "reply_formats.h"
 
 #ifdef VERBOSE
diff --git a/xcbdpyinfo.c b/xcbdpyinfo.c
index 711c29e..fe0145b 100644
--- a/xcbdpyinfo.c
+++ b/xcbdpyinfo.c
@@ -1,4 +1,4 @@
-#include <X11/XCB/xcb.h>
+#include <xcb/xcb.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/xcbrandr.c b/xcbrandr.c
index 27c0f54..bd22604 100644
--- a/xcbrandr.c
+++ b/xcbrandr.c
@@ -29,10 +29,10 @@
  */
 
 #include <stdio.h>
-#include <X11/XCB/xcb.h>
-#include <X11/XCB/xcb_aux.h>
-#include <X11/XCB/randr.h>
-#include <X11/XCB/render.h>	/* we share subpixel information */
+#include <xcb/xcb.h>
+#include <xcb/xcb_aux.h>
+#include <xcb/randr.h>
+#include <xcb/render.h>	/* we share subpixel information */
 #include <string.h>
 #include <stdlib.h>
 
diff --git a/xcbxf86dri.c b/xcbxf86dri.c
index 60672f1..435b3a3 100644
--- a/xcbxf86dri.c
+++ b/xcbxf86dri.c
@@ -1,7 +1,7 @@
 /* Copyright (C) 2006 Josh Triplett. All Rights Reserved.  See the file
  * COPYING in this directory for licensing information. */
-#include <X11/XCB/xcb.h>
-#include <X11/XCB/xf86dri.h>
+#include <xcb/xcb.h>
+#include <xcb/xf86dri.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xcbxvinfo.c b/xcbxvinfo.c
index 336708e..89691de 100644
--- a/xcbxvinfo.c
+++ b/xcbxvinfo.c
@@ -2,8 +2,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <X11/XCB/xcb.h>
-#include <X11/XCB/xv.h>
+#include <xcb/xcb.h>
+#include <xcb/xv.h>
 
 static void PrintUsage()
 {
-- 
2.34.1