From 9be278d4f52b81a1e2b01d119e3a04bfd5fbc688 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Thu, 22 Nov 2018 11:10:53 +0100 Subject: [PATCH] gl: libs: glib might not define G_HAVE_ISO_VARARGS This will fix the compiler warning "G_HAVE_ISO_VARARGS" is not defined, evaluates to 0 [-Wundef] --- gst-libs/gst/gl/gstgldebug.h | 4 ++-- gst-libs/gst/gl/gstglquery.h | 2 +- gst-libs/gst/gl/gstglshader.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gst-libs/gst/gl/gstgldebug.h b/gst-libs/gst/gl/gstgldebug.h index 99e6ce2..fc73d1b 100644 --- a/gst-libs/gst/gl/gstgldebug.h +++ b/gst-libs/gst/gl/gstgldebug.h @@ -94,7 +94,7 @@ void gst_gl_async_debug_thaw (GstGLAsyncDebug * * Stores a debug message in @ad for later output */ -#if G_HAVE_ISO_VARARGS +#ifdef G_HAVE_ISO_VARARGS #define GST_GL_ASYNC_CAT_LEVEL_LOG(ad,cat,level,object,format,...) \ gst_gl_async_debug_store_log_msg (ad, cat, level, __FILE__, GST_FUNCTION, \ __LINE__, object, format, __VA_ARGS__) @@ -149,7 +149,7 @@ void gst_gl_async_debug_store_log_msg_valist (GstGLAsyncDebug * ad, #define gst_gl_async_debug_output_log_msg(ad) G_STMT_START{ }G_STMT_END #define gst_gl_async_debug_store_log_msg_valist(ad,cat,level,file,function,line,object,format,args) G_STMT_START{ }G_STMT_END -#if G_HAVE_ISO_VARARGS +#ifdef G_HAVE_ISO_VARARGS #define gst_gl_insert_debug_marker(...) G_STMT_START{ }G_STMT_END #define gst_gl_async_debug_store_log_msg(...) G_STMT_START{ }G_STMT_END diff --git a/gst-libs/gst/gl/gstglquery.h b/gst-libs/gst/gl/gstglquery.h index 09950d5..237663a 100644 --- a/gst-libs/gst/gl/gstglquery.h +++ b/gst-libs/gst/gl/gstglquery.h @@ -96,7 +96,7 @@ guint64 gst_gl_query_result (GstGLQuery * query); gst_gl_async_debug_thaw (&(query)->debug); \ } G_STMT_END -#if G_HAVE_ISO_VARARGS +#ifdef G_HAVE_ISO_VARARGS #define gst_gl_query_start_log(query,cat,level,object,format,...) \ G_STMT_START { \ diff --git a/gst-libs/gst/gl/gstglshader.c b/gst-libs/gst/gl/gstglshader.c index 44daad8..156a8e6 100644 --- a/gst-libs/gst/gl/gstglshader.c +++ b/gst-libs/gst/gl/gstglshader.c @@ -831,7 +831,7 @@ gst_gl_context_clear_shader (GstGLContext * context) g_return_if_fail (shader->priv->program_handle != 0); \ location = _get_uniform_location (shader, name); -#if G_HAVE_ISO_VARARGS +#ifdef G_HAVE_ISO_VARARGS #define set_uniform_v(gl_suffix, c_type, debug_stride, debug_str, ...) \ void \ -- 2.7.4