From fe140f03726c603f4802e4977621b46f03fe4d3c Mon Sep 17 00:00:00 2001
From: "Xiang, Haihao" <haihao.xiang@intel.com>
Date: Thu, 29 Dec 2011 16:27:24 +0800
Subject: [PATCH] Avoid depending on va_backend.h for some files

Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
---
 src/gen6_mfd.c             | 2 --
 src/gen6_vme.c             | 2 --
 src/gen7_mfd.c             | 2 --
 src/i965_encoder.c         | 2 --
 src/i965_media.c           | 2 --
 src/i965_media_mpeg2.c     | 2 --
 src/i965_post_processing.c | 2 --
 src/i965_render.c          | 1 -
 src/intel_batchbuffer.c    | 2 --
 src/intel_driver.h         | 5 +++++
 10 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/gen6_mfd.c b/src/gen6_mfd.c
index 92cbce9..a38360b 100644
--- a/src/gen6_mfd.c
+++ b/src/gen6_mfd.c
@@ -31,8 +31,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <va/va_backend.h>
-
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
 
diff --git a/src/gen6_vme.c b/src/gen6_vme.c
index 09a042f..2ffbd43 100644
--- a/src/gen6_vme.c
+++ b/src/gen6_vme.c
@@ -30,8 +30,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <va/va_backend.h>
-
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
 
diff --git a/src/gen7_mfd.c b/src/gen7_mfd.c
index 9308999..07cc0c9 100644
--- a/src/gen7_mfd.c
+++ b/src/gen7_mfd.c
@@ -31,8 +31,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <va/va_backend.h>
-
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
 
diff --git a/src/i965_encoder.c b/src/i965_encoder.c
index 0b1efef..29f8de2 100644
--- a/src/i965_encoder.c
+++ b/src/i965_encoder.c
@@ -31,8 +31,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <va/va_backend.h>
-
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
 
diff --git a/src/i965_media.c b/src/i965_media.c
index d6a56d2..771f38f 100644
--- a/src/i965_media.c
+++ b/src/i965_media.c
@@ -32,8 +32,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <va/va_backend.h>
-
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
 #include "i965_defines.h"
diff --git a/src/i965_media_mpeg2.c b/src/i965_media_mpeg2.c
index 15edc5b..1d87d9b 100644
--- a/src/i965_media_mpeg2.c
+++ b/src/i965_media_mpeg2.c
@@ -32,8 +32,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <va/va_backend.h>
-
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
 #include "i965_defines.h"
diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
index 4201d09..090403c 100644
--- a/src/i965_post_processing.c
+++ b/src/i965_post_processing.c
@@ -31,8 +31,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <va/va_backend.h>
-
 #include "intel_batchbuffer.h"
 #include "intel_driver.h"
 #include "i965_defines.h"
diff --git a/src/i965_render.c b/src/i965_render.c
index b45edfc..0fa76d2 100644
--- a/src/i965_render.c
+++ b/src/i965_render.c
@@ -36,7 +36,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <va/va_backend.h>
 #include <va/va_dricommon.h>
 
 #include "intel_batchbuffer.h"
diff --git a/src/intel_batchbuffer.c b/src/intel_batchbuffer.c
index f310793..0b52281 100644
--- a/src/intel_batchbuffer.c
+++ b/src/intel_batchbuffer.c
@@ -29,8 +29,6 @@
 #include <string.h>
 #include <assert.h>
 
-#include <va/va_backend.h>
-
 #include "intel_batchbuffer.h"
 
 static void 
diff --git a/src/intel_driver.h b/src/intel_driver.h
index 380a18d..471ad19 100644
--- a/src/intel_driver.h
+++ b/src/intel_driver.h
@@ -1,6 +1,7 @@
 #ifndef _INTEL_DRIVER_H_
 #define _INTEL_DRIVER_H_
 
+#include <stddef.h>
 #include <pthread.h>
 #include <signal.h>
 
@@ -62,6 +63,10 @@ struct intel_batchbuffer;
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 #define ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
 
+#define Bool int
+#define True 1
+#define False 0
+
 #define SET_BLOCKED_SIGSET()   do {     \
         sigset_t bl_mask;               \
         sigfillset(&bl_mask);           \
-- 
2.7.4