summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBart Massey <bart@cs.pdx.edu>2008-01-27 11:57:36 -0800
committerBart Massey <bart@cs.pdx.edu>2008-01-27 11:57:36 -0800
commite86bf9a5ff3b99786613dbf2745e8fd7ec600cfa (patch)
tree528d9876206911bd69a18d7fa8972733697f0aeb
parent74a3b2b951f88cf46e580d3649acf6b5ce679ba3 (diff)
made image tests compile when not installed; fixed regression in test_formats.c
-rw-r--r--image/test_bitmap.c2
-rw-r--r--image/test_formats.c10
-rw-r--r--image/test_xcb_image.c2
-rw-r--r--image/test_xcb_image_shm.c2
4 files changed, 8 insertions, 8 deletions
diff --git a/image/test_bitmap.c b/image/test_bitmap.c
index fe1b3bb..c9d5b49 100644
--- a/image/test_bitmap.c
+++ b/image/test_bitmap.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <assert.h>
#include <xcb/xcb.h>
-#include <xcb/xcb_aux.h>
+#include "../aux/xcb_aux.h"
#include "xcb_image.h"
#include "test.xbm"
diff --git a/image/test_formats.c b/image/test_formats.c
index 276f442..d64e55b 100644
--- a/image/test_formats.c
+++ b/image/test_formats.c
@@ -1,10 +1,10 @@
-#include <xcb/xcb.h>
-#include "xcb_image.h"
-#include "xcb_aux.h"
-#include "xcb_bitops.h"
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include <xcb/xcb.h>
+#include "../aux/xcb_aux.h"
+#include "../aux/xcb_bitops.h"
+#include "xcb_image.h"
#define WIDTH 50
#define HEIGHT 50
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
if(argc > 1)
format = parse_format(argv[1]);
if (root->root_depth != 24 ||
- visual->visual_class != XCB_VISUAL_CLASS_TRUE_COLOR)
+ visual->_class != XCB_VISUAL_CLASS_TRUE_COLOR)
{
printf("Only 24 bit TrueColor visuals for now\n");
exit(1);
diff --git a/image/test_xcb_image.c b/image/test_xcb_image.c
index 56904cf..ddb708e 100644
--- a/image/test_xcb_image.c
+++ b/image/test_xcb_image.c
@@ -5,7 +5,7 @@
#include <xcb/xcb.h>
-#include "xcb_aux.h"
+#include "../aux/xcb_aux.h"
#include "xcb_image.h"
#define W_W 64
diff --git a/image/test_xcb_image_shm.c b/image/test_xcb_image_shm.c
index 7e0bc59..c879dbe 100644
--- a/image/test_xcb_image_shm.c
+++ b/image/test_xcb_image_shm.c
@@ -7,7 +7,7 @@
#include <xcb/xcb.h>
#include <xcb/shm.h>
-#include "xcb_aux.h"
+#include "../aux/xcb_aux.h"
#include "xcb_image.h"
#define W_W 40