From 0dd66648c3bab1dbfe571320fdda1d20c61ceb49 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
Date: Tue, 19 Dec 2017 16:51:24 +0000
Subject: [PATCH] gl: fix up a few more #if HAVE_FOO

error: "HAVE_PNG" is not defined, evaluates to 0 [-Werror=undef]
---
 ext/gl/effects/gstgleffectssources.c    | 2 +-
 ext/gl/gstopengl.c                      | 4 ++--
 gst-libs/gst/gl/gstglcontext.c          | 2 +-
 gst-libs/gst/gl/gstglwindow.c           | 2 +-
 tests/check/pipelines/gl-launch-lines.c | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ext/gl/effects/gstgleffectssources.c b/ext/gl/effects/gstgleffectssources.c
index b83e1d7..a79e257 100644
--- a/ext/gl/effects/gstgleffectssources.c
+++ b/ext/gl/effects/gstgleffectssources.c
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
diff --git a/ext/gl/gstopengl.c b/ext/gl/gstopengl.c
index 683ec01..fc67298 100644
--- a/ext/gl/gstopengl.c
+++ b/ext/gl/gstopengl.c
@@ -85,7 +85,7 @@
 #ifdef HAVE_VIDEO_AGGREGATOR_IN_BASE
 #include "gstglmosaic.h"
 #endif
-#if HAVE_PNG
+#ifdef HAVE_PNG
 #include "gstgldifferencematte.h"
 /* #include "gstglbumper.h" */
 #endif /* HAVE_PNG */
@@ -268,7 +268,7 @@ plugin_init (GstPlugin * plugin)
     return FALSE;
   }
 #endif
-#if HAVE_PNG
+#ifdef HAVE_PNG
   if (!gst_element_register (plugin, "gldifferencematte",
           GST_RANK_NONE, gst_gl_differencematte_get_type ())) {
     return FALSE;
diff --git a/gst-libs/gst/gl/gstglcontext.c b/gst-libs/gst/gl/gstglcontext.c
index d89e4db..8baa2ee 100644
--- a/gst-libs/gst/gl/gstglcontext.c
+++ b/gst-libs/gst/gl/gstglcontext.c
@@ -29,7 +29,7 @@
  * specified and must only be activated in a single thread.
  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
diff --git a/gst-libs/gst/gl/gstglwindow.c b/gst-libs/gst/gl/gstglwindow.c
index 3818ab1..00ccf66 100644
--- a/gst-libs/gst/gl/gstglwindow.c
+++ b/gst-libs/gst/gl/gstglwindow.c
@@ -28,7 +28,7 @@
  * either be a user visible window (onscreen) or hidden (offscreen).
  */
 
-#if HAVE_CONFIG_H
+#ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
 
diff --git a/tests/check/pipelines/gl-launch-lines.c b/tests/check/pipelines/gl-launch-lines.c
index 2289f63..a0b2b01 100644
--- a/tests/check/pipelines/gl-launch-lines.c
+++ b/tests/check/pipelines/gl-launch-lines.c
@@ -187,7 +187,7 @@ GST_START_TEST (test_glfilterapp)
 
 GST_END_TEST
 #ifdef HAVE_PNG
-#if HAVE_JPEG
+#ifdef HAVE_JPEG
 GST_START_TEST (test_gloverlay)
 {
   const gchar *s;
@@ -337,7 +337,7 @@ gl_launch_lines_suite (void)
   tcase_add_test (tc_chain, test_glshader);
   tcase_add_test (tc_chain, test_glfilterapp);
 #ifdef HAVE_PNG
-#if HAVE_JPEG
+#ifdef HAVE_JPEG
   tcase_add_test (tc_chain, test_gloverlay);
 #endif
 #endif
@@ -354,7 +354,7 @@ gl_launch_lines_suite (void)
 #ifdef HAVE_PNG
   tcase_add_test (tc_chain, test_gldifferencematte);
 /*  tcase_add_test (tc_chain, test_glbumper);*/
-#if HAVE_JPEG
+#ifdef HAVE_JPEG
 #endif /* HAVE_JPEG */
 #endif /* HAVE_PNG */
 #endif /* GST_GL_HAVE_OPENGL */
-- 
2.7.4