diff options
author | Dmitry Ermilov <dmitry.ermilov@intel.com> | 2012-07-03 15:34:24 +0200 |
---|---|---|
committer | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-07-16 13:09:11 +0200 |
commit | 340c3c431fe5fbe26f2c4a5e2ea2d5f4cd707c6d (patch) | |
tree | cd850fbc0a79d3d02a0a42813bdd29b6842cc934 | |
parent | a3f855e4c7b859cd8320d0492260bb5f7adc6160 (diff) |
drm: fix build without X11 headers.{merged}/staging.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.c | 4 | ||||
-rw-r--r-- | va/sysdeps.h | 1 | ||||
-rw-r--r-- | va/va.c | 18 | ||||
-rw-r--r-- | va/va_backend.h | 3 |
4 files changed, 10 insertions, 16 deletions
diff --git a/dummy_drv_video/dummy_drv_video.c b/dummy_drv_video/dummy_drv_video.c index 310fb20..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 */ - Drawable drawable = (Drawable)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> @@ -123,31 +123,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 diff --git a/va/va_backend.h b/va/va_backend.h index 83143c5..077cf8b 100644 --- a/va/va_backend.h +++ b/va/va_backend.h @@ -30,9 +30,6 @@ #define _VA_BACKEND_H_ #include <va/va.h> -#ifndef ANDROID -#include <X11/Xlib.h> -#endif #include <linux/videodev2.h> typedef struct VADriverContext *VADriverContextP; |