[Xcb-commit] 2 commits - xcb-util

[Josh Triplett]

 xcb-util/image/Makefile.am      |   13 +++++++------
 xcb-util/image/test_formats.c   |    1 -
 xcb-util/image/test_xcb_image.c |    1 -
 xcb-util/image/xcb_image.c      |    2 +-
 xcb-util/image/xcb_image.h      |    3 ++-
 5 files changed, 10 insertions(+), 10 deletions(-)

New commits:
diff-tree 2aca179885b88aff8fa258666367850cd8820d97 (from c5b0950e472b919f92b37bf7e5f33dc2f57ac4ba)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Fri Apr 28 11:19:36 2006 -0700

    Make xcb_image.h self-contained by including the xcb.h and shm.h headers.  Remove unused headers from the libXCBImage test programs.  Change Makefile.am to match the headers and libraries actually used by the test programs.

diff --git a/xcb-util/image/Makefile.am b/xcb-util/image/Makefile.am
index c7912ed..8bae709 100644
--- a/xcb-util/image/Makefile.am
+++ b/xcb-util/image/Makefile.am
@@ -18,13 +18,14 @@ EXTRA_DIST=xcb-image.pc.in
 noinst_PROGRAMS = test_xcb_image test_xcb_image_shm test_formats
 
 test_xcb_image_SOURCES = test_xcb_image.c
-test_xcb_image_CFLAGS = $(XCB_CFLAGS) -I../convenient
-test_xcb_image_LDADD =  -L../convenient -lXCBAux -lXCBImage
+test_xcb_image_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient
+test_xcb_image_LDADD = $(XCB_LIBS) -L../convenient -lXCBAux -lXCBImage
 
 test_xcb_image_shm_SOURCES = test_xcb_image_shm.c
-test_xcb_image_shm_CFLAGS = $(XCB_SHM_CFLAGS) -I../convenient
-test_xcb_image_shm_LDADD = $(XCB_SHM_LIBS) -L../convenient -lXCBAux -lXCBImage
+test_xcb_image_shm_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient
+test_xcb_image_shm_LDADD = $(XCB_LIBS) $(XCB_SHM_LIBS) \
+	-L../convenient -lXCBAux -lXCBImage
 
 test_formats_SOURCES = test_formats.c
-test_formats_CFLAGS = $(XCB_SHM_CFLAGS) -I../convenient
-test_formats_LDADD = $(XCB_SHM_LIBS) -L../convenient -lXCBAux -lXCBImage
+test_formats_CFLAGS = $(XCB_CFLAGS) $(XCB_SHM_CFLAGS) -I../convenient
+test_formats_LDADD = $(XCB_LIBS) -L../convenient -lXCBAux -lXCBImage
diff --git a/xcb-util/image/test_formats.c b/xcb-util/image/test_formats.c
index 98b60b4..009d185 100644
--- a/xcb-util/image/test_formats.c
+++ b/xcb-util/image/test_formats.c
@@ -1,5 +1,4 @@
 #include <X11/XCB/xcb.h>
-#include <X11/XCB/shm.h>
 #include "xcb_image.h"
 #include "xcb_aux.h"
 #include <stdio.h>
diff --git a/xcb-util/image/test_xcb_image.c b/xcb-util/image/test_xcb_image.c
index 36a2c7d..cd16c50 100644
--- a/xcb-util/image/test_xcb_image.c
+++ b/xcb-util/image/test_xcb_image.c
@@ -4,7 +4,6 @@
 #include <stdio.h>
 
 #include <X11/XCB/xcb.h>
-#include <X11/XCB/shm.h>
 
 #include "xcb_aux.h"
 #include "xcb_image.h"
diff --git a/xcb-util/image/xcb_image.h b/xcb-util/image/xcb_image.h
index 1a54550..ffdb607 100644
--- a/xcb-util/image/xcb_image.h
+++ b/xcb-util/image/xcb_image.h
@@ -1,7 +1,8 @@
 
 #ifndef __XCB_IMAGE_H__
 #define __XCB_IMAGE_H__
-
+#include <X11/XCB/xcb.h>
+#include <X11/XCB/shm.h>
 
 /**
  * @defgroup XCB_Image XCB Image Functions
diff-tree c5b0950e472b919f92b37bf7e5f33dc2f57ac4ba (from f6deae50fc0df0d760dc87a3a5db4fe30a192332)
Author: Josh Triplett <josh at freedesktop.org>
Date:   Fri Apr 28 11:10:21 2006 -0700

    s/HACKMEM/HAKMEM/ in a comment.

diff --git a/xcb-util/image/xcb_image.c b/xcb-util/image/xcb_image.c
index 6a6abbb..93b7879 100644
--- a/xcb-util/image/xcb_image.c
+++ b/xcb-util/image/xcb_image.c
@@ -20,7 +20,7 @@ static inline CARD32 _lomask(int n)
   return (1 << n) - 1;
 }
 
-static unsigned int Ones(                /* HACKMEM 169 */
+static unsigned int Ones(                /* HAKMEM 169 */
     CARD32 mask)
 {
     register CARD32 y;