From 8170d0bf15e6552cfff524759fc254c6534610cf Mon Sep 17 00:00:00 2001 From: Gwenole Beauchesne Date: Fri, 29 Oct 2010 10:47:23 +0200 Subject: [PATCH] Add sysdeps.h for system-dependent definitions. e.g. Android. --- va/glx/va_glx_impl.c | 2 +- va/glx/va_glx_private.h | 2 +- va/sysdeps.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ va/va.c | 8 +------- va/va_tpi.c | 2 +- va/x11/va_x11.c | 2 +- 6 files changed, 49 insertions(+), 11 deletions(-) create mode 100644 va/sysdeps.h diff --git a/va/glx/va_glx_impl.c b/va/glx/va_glx_impl.c index f5bbe91..9d38930 100644 --- a/va/glx/va_glx_impl.c +++ b/va/glx/va_glx_impl.c @@ -36,7 +36,7 @@ static void va_glx_error_message(const char *format, ...) { va_list args; va_start(args, format); - fprintf(stderr, "[%s] ", PACKAGE_NAME); + fprintf(stderr, "libva-glx error: "); vfprintf(stderr, format, args); va_end(args); } diff --git a/va/glx/va_glx_private.h b/va/glx/va_glx_private.h index eb1185c..e86efb6 100644 --- a/va/glx/va_glx_private.h +++ b/va/glx/va_glx_private.h @@ -25,7 +25,7 @@ #ifndef VA_GLX_PRIVATE_H #define VA_GLX_PRIVATE_H -#include "config.h" +#include "sysdeps.h" #include "va.h" #include "va_backend.h" #include "va_x11.h" diff --git a/va/sysdeps.h b/va/sysdeps.h new file mode 100644 index 0000000..0752b17 --- /dev/null +++ b/va/sysdeps.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2007-2009 Intel Corporation. All Rights Reserved. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the + * "Software"), to deal in the Software without restriction, including + * without limitation the rights to use, copy, modify, merge, publish, + * distribute, sub license, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to + * the following conditions: + * + * The above copyright notice and this permission notice (including the + * next paragraph) shall be included in all copies or substantial portions + * of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. + * IN NO EVENT SHALL INTEL AND/OR ITS SUPPLIERS BE LIABLE FOR + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef SYSDEPS_H +#define SYSDEPS_H + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include +#include +#include +#include + +#ifdef ANDROID +# define Bool int +# define True 1 +# define False 0 +#endif + +#endif /* SYSDEPS_H */ diff --git a/va/va.c b/va/va.c index 0320ed3..268ba36 100644 --- a/va/va.c +++ b/va/va.c @@ -23,11 +23,11 @@ */ #define _GNU_SOURCE 1 +#include "sysdeps.h" #include "va.h" #include "va_backend.h" #include "va_trace.h" #include "va_fool.h" -#include "config.h" #include #include @@ -37,12 +37,6 @@ #include #include -#ifdef ANDROID -#define Bool int -#define True 1 -#define False 0 -#endif - #define DRIVER_INIT_FUNC "__vaDriverInit_0_31" #define DRIVER_EXTENSION "_drv_video.so" diff --git a/va/va_tpi.c b/va/va_tpi.c index 1f01ef0..4472913 100644 --- a/va/va_tpi.c +++ b/va/va_tpi.c @@ -23,10 +23,10 @@ */ #define _GNU_SOURCE 1 +#include "sysdeps.h" #include "va.h" #include "va_backend.h" #include "va_backend_tpi.h" -#include "config.h" #include #include diff --git a/va/x11/va_x11.c b/va/x11/va_x11.c index 70cea30..93eb243 100644 --- a/va/x11/va_x11.c +++ b/va/x11/va_x11.c @@ -23,7 +23,7 @@ */ #define _GNU_SOURCE 1 -#include "config.h" +#include "sysdeps.h" #include "va.h" #include "va_backend.h" #include "va_x11.h" -- 2.7.4