From 0190b72c557450d4b82c8dc26a5ebaac3df904ec Mon Sep 17 00:00:00 2001 From: Mark Thompson Date: Mon, 19 Jun 2017 19:09:04 +0100 Subject: Move declarations for internal functions to new header The new header is internal-only and will not be installed. Signed-off-by: Mark Thompson --- va/va_fool.c | 7 +------ va/va_internal.h | 33 +++++++++++++++++++++++++++++++++ va/va_trace.c | 7 +------ 3 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 va/va_internal.h diff --git a/va/va_fool.c b/va/va_fool.c index 8dbe8dd..0907f75 100644 --- a/va/va_fool.c +++ b/va/va_fool.c @@ -26,6 +26,7 @@ #include "sysdeps.h" #include "va.h" #include "va_backend.h" +#include "va_internal.h" #include "va_trace.h" #include "va_fool.h" @@ -102,12 +103,6 @@ struct fool_context { if ((fool_ctx == NULL) || (fool_ctx->enabled == 0)) \ return 0; /* no fool for the context */ \ -/* Prototype declarations (functions defined in va.c) */ - -void va_errorMessage(const char *msg, ...); -void va_infoMessage(const char *msg, ...); - -int va_parseConfig(char *env, char *env_value); void va_FoolInit(VADisplay dpy) { diff --git a/va/va_internal.h b/va/va_internal.h new file mode 100644 index 0000000..4d60368 --- /dev/null +++ b/va/va_internal.h @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2017 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 PRECISION INSIGHT 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 VA_INTERNAL_H +#define VA_INTERNAL_H + +void va_errorMessage(const char *msg, ...); +void va_infoMessage(const char *msg, ...); + +int va_parseConfig(char *env, char *env_value); + +#endif /* VA_INTERNAL_H */ diff --git a/va/va_trace.c b/va/va_trace.c index 9162929..886708f 100755 --- a/va/va_trace.c +++ b/va/va_trace.c @@ -28,6 +28,7 @@ #include "va.h" #include "va_enc_h264.h" #include "va_backend.h" +#include "va_internal.h" #include "va_trace.h" #include "va_enc_h264.h" #include "va_enc_jpeg.h" @@ -233,12 +234,6 @@ struct va_trace { va_TraceMsg(trace_ctx, "") ; \ } while (0) -/* Prototype declarations (functions defined in va.c) */ - -void va_errorMessage(const char *msg, ...); -void va_infoMessage(const char *msg, ...); - -int va_parseConfig(char *env, char *env_value); VAStatus vaBufferInfo( VADisplay dpy, -- cgit v1.2.1