From 12e669f3881e395bdffb83424b5f76b678353ce2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?utf8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Tue, 18 Mar 2014 00:08:50 +0000 Subject: [PATCH] gl: fix the use of always-defined macros After 2a0f0399ae226089c2ba07b1b904741b856f37af GST_GL_* macros are always defined to 0 or 1. Don't use #ifdef ... or #if defined() on them. https://bugzilla.gnome.org/show_bug.cgi?id=726591 --- tests/examples/gtk/gstgtk.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/examples/gtk/gstgtk.c b/tests/examples/gtk/gstgtk.c index eb62725..3d0d15a 100644 --- a/tests/examples/gtk/gstgtk.c +++ b/tests/examples/gtk/gstgtk.c @@ -24,13 +24,13 @@ #include #include "gstgtk.h" -#if defined(GST_GL_HAVE_WINDOW_WIN32) && defined(GDK_WINDOWING_WIN32) +#if GST_GL_HAVE_WINDOW_WIN32 && GDK_WINDOWING_WIN32 #include #endif -#if defined(GST_GL_HAVE_WINDOW_X11) && defined(GDK_WINDOWING_X11) +#if GST_GL_HAVE_WINDOW_X11 && GDK_WINDOWING_X11 #include #endif -#if defined(GST_GL_HAVE_WINDOW_COCOA) && defined(GDK_WINDOWING_QUARTZ) +#if GST_GL_HAVE_WINDOW_COCOA && GDK_WINDOWING_QUARTZ #include #endif @@ -46,21 +46,21 @@ gst_video_overlay_set_gtk_window (GstVideoOverlay * videooverlay, window = gtk_widget_get_window (widget); display = gdk_window_get_display (window); -#if defined(GST_GL_HAVE_WINDOW_WIN32) && defined(GDK_WINDOWING_WIN32) +#if GST_GL_HAVE_WINDOW_WIN32 && GDK_WINDOWING_WIN32 if (GDK_IS_WIN32_DISPLAY (display) && (!user_choice || g_strcmp0 (user_choice, "win32") == 0)) { gst_video_overlay_set_window_handle (videooverlay, (guintptr) GDK_WINDOW_HWND (window)); } else #endif -#if defined(GST_GL_HAVE_WINDOW_COCOA) && defined(GDK_WINDOWING_QUARTZ) +#if GST_GL_HAVE_WINDOW_COCOA && GDK_WINDOWING_QUARTZ if (GDK_IS_QUARTZ_DISPLAY (display) && (!user_choice || g_strcmp0 (user_choice, "cocoa") == 0)) { gst_video_overlay_set_window_handle (videooverlay, (guintptr) gdk_quartz_window_get_nswindow (window)); } else #endif -#if defined(GST_GL_HAVE_WINDOW_X11) && defined(GDK_WINDOWING_X11) +#if GST_GL_HAVE_WINDOW_X11 && GDK_WINDOWING_X11 if (GDK_IS_X11_DISPLAY (display) && (!user_choice || g_strcmp0 (user_choice, "x11") == 0)) { gst_video_overlay_set_window_handle (videooverlay, GDK_WINDOW_XID (window)); -- 2.7.4