summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Ermilov <dmitry.ermilov@intel.com>2012-07-03 15:34:24 +0200
committerGwenole Beauchesne <gwenole.beauchesne@intel.com>2012-07-16 11:24:01 +0200
commit8d34a93829e50f9d04d82388383a181e7d9ce344 (patch)
tree1c7bdcd8ed98f65423aadc04e997932e0e33f992
parent08e3c1ba0c236a0119277c67d0002330da80f796 (diff)
drm: fix build without X11 headers.{merged}/11.drm
Signed-off-by: Dmitry Ermilov <dmitry.ermilov@intel.com> Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-rw-r--r--dummy_drv_video/dummy_drv_video.c4
-rw-r--r--va/sysdeps.h1
-rw-r--r--va/va.c18
3 files changed, 10 insertions, 13 deletions
diff --git a/dummy_drv_video/dummy_drv_video.c b/dummy_drv_video/dummy_drv_video.c
index a6e76b9..9d442fa 100644
--- a/dummy_drv_video/dummy_drv_video.c
+++ b/dummy_drv_video/dummy_drv_video.c
@@ -1056,10 +1056,6 @@ VAStatus dummy_PutSurface(
)
{
/* TODO */
- void *drawable = (void *)draw;
-
- (void)drawable;
-
return VA_STATUS_ERROR_UNKNOWN;
}
diff --git a/va/sysdeps.h b/va/sysdeps.h
index 0752b17..2ab37e9 100644
--- a/va/sysdeps.h
+++ b/va/sysdeps.h
@@ -31,6 +31,7 @@
#include <stdio.h>
#include <stdlib.h>
+#include <stdbool.h>
#include <string.h>
#include <stdint.h>
#include <assert.h>
diff --git a/va/va.c b/va/va.c
index fdbe044..facec34 100644
--- a/va/va.c
+++ b/va/va.c
@@ -125,31 +125,31 @@ void va_infoMessage(const char *msg, ...)
va_end(args);
}
-static Bool va_checkVtable(void *ptr, char *function)
+static bool va_checkVtable(void *ptr, char *function)
{
if (!ptr) {
va_errorMessage("No valid vtable entry for va%s\n", function);
- return False;
+ return false;
}
- return True;
+ return true;
}
-static Bool va_checkMaximum(int value, char *variable)
+static bool va_checkMaximum(int value, char *variable)
{
if (!value) {
va_errorMessage("Failed to define max_%s in init\n", variable);
- return False;
+ return false;
}
- return True;
+ return true;
}
-static Bool va_checkString(const char* value, char *variable)
+static bool va_checkString(const char* value, char *variable)
{
if (!value) {
va_errorMessage("Failed to define str_%s in init\n", variable);
- return False;
+ return false;
}
- return True;
+ return true;
}
static inline int