diff options
| author | Damien Lespiau <damien.lespiau@intel.com> | 2011-11-08 19:23:58 +0000 |
|---|---|---|
| committer | Damien Lespiau <damien.lespiau@intel.com> | 2011-11-08 19:23:58 +0000 |
| commit | 23f7c03ac8e67b72f6bf9111fcfe4ed959a99c0a (patch) | |
| tree | 75f163d84191553b427da9727805f6e0fc1adfc8 | |
| parent | d424509377fe60d7b58b45fa812e3bc55f4da928 (diff) | |
build: Fix the usage of the CLUTTER_WINDOWING_X11 macro
We used #if with a defined that changed from beging a integer to a
string. Using #ifdefs should work fine.
| -rw-r--r-- | clutter-gst/clutter-gst-player.c | 6 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-util.c | 6 | ||||
| -rw-r--r-- | clutter-gst/clutter-gst-video-sink.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/clutter-gst/clutter-gst-player.c b/clutter-gst/clutter-gst-player.c index b838de0..e35ec61 100644 --- a/clutter-gst/clutter-gst-player.c +++ b/clutter-gst/clutter-gst-player.c @@ -57,7 +57,7 @@ #include "clutter-gst-player.h" #include "clutter-gst-private.h" -#if CLUTTER_WINDOWING_X11 && HAVE_HW_DECODER_SUPPORT +#if defined (CLUTTER_WINDOWING_X11) && defined (HAVE_HW_DECODER_SUPPORT) #define GST_USE_UNSTABLE_API 1 #include <gst/video/videocontext.h> #include <clutter/x11/clutter-x11.h> @@ -1883,7 +1883,7 @@ clutter_gst_player_get_idle_impl (ClutterGstPlayer *player) /**/ -#if CLUTTER_WINDOWING_X11 && HAVE_HW_DECODER_SUPPORT +#if defined (CLUTTER_WINDOWING_X11) && defined (HAVE_HW_DECODER_SUPPORT) static GstBusSyncReply on_sync_message (GstBus * bus, GstMessage * message, gpointer user_data) { @@ -2031,7 +2031,7 @@ clutter_gst_player_init (ClutterGstPlayer *player) G_CALLBACK (on_current_text_changed), player); -#if CLUTTER_WINDOWING_X11 && HAVE_HW_DECODER_SUPPORT +#if defined(CLUTTER_WINDOWING_X11) && defined (HAVE_HW_DECODER_SUPPORT) gst_bus_set_sync_handler (priv->bus, on_sync_message, clutter_x11_get_default_display ()); #endif diff --git a/clutter-gst/clutter-gst-util.c b/clutter-gst/clutter-gst-util.c index a57b9e2..9c858ec 100644 --- a/clutter-gst/clutter-gst-util.c +++ b/clutter-gst/clutter-gst-util.c @@ -99,7 +99,7 @@ #include <gst/gst.h> #include <clutter/clutter.h> -#if CLUTTER_WINDOWING_X11 +#if defined (CLUTTER_WINDOWING_X11) #include <X11/Xlib.h> #endif @@ -131,7 +131,7 @@ clutter_gst_init (int *argc, if (clutter_gst_is_initialized) return CLUTTER_INIT_SUCCESS; -#if CLUTTER_WINDOWING_X11 +#if defined (CLUTTER_WINDOWING_X11) /* Required by some GStreamer element like VA */ XInitThreads (); #endif @@ -190,7 +190,7 @@ clutter_gst_init_with_args (int *argc, if (clutter_gst_is_initialized) return CLUTTER_INIT_SUCCESS; -#if CLUTTER_WINDOWING_X11 +#if defined (CLUTTER_WINDOWING_X11) /* Required by some gstreamer element like VA */ XInitThreads (); #endif diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c index ec1fa16..1bd0c77 100644 --- a/clutter-gst/clutter-gst-video-sink.c +++ b/clutter-gst/clutter-gst-video-sink.c @@ -65,7 +65,7 @@ #include <gst/video/gstsurfacebuffer.h> #endif -#if CLUTTER_WINDOWING_X11 +#if defined (CLUTTER_WINDOWING_X11) #include <X11/Xlib.h> #endif @@ -1647,7 +1647,7 @@ static gboolean plugin_init (GstPlugin *plugin) { -#if CLUTTER_WINDOWING_X11 +#if defined (CLUTTER_WINDOWING_X11) /* Required by some GStreamer element like VA */ XInitThreads (); #endif |