From 1c4bd93b113004e17345bc178dee9c6e0be274a8 Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Fri, 21 Nov 2008 16:18:38 +0000 Subject: [PATCH] Bug 1269 - mingw32 building failed at clutter-media.c * clutter/clutter-media.c: Rename the 'ERROR' signal enum to 'ERROR_SIGNAL' otherwise it clashes with windgi.h. Thanks to David Kedves --- ChangeLog | 8 ++++++++ clutter/clutter-media.c | 10 +++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index e8f46b8a4..e21f73c46 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-11-21 Neil Roberts + + Bug 1269 - mingw32 building failed at clutter-media.c + + * clutter/clutter-media.c: Rename the 'ERROR' signal enum to + 'ERROR_SIGNAL' otherwise it clashes with windgi.h. Thanks to David + Kedves + 2008-11-21 Neil Roberts * clutter/pango/cogl-pango.h: Include pango/pango.h to get diff --git a/clutter/clutter-media.c b/clutter/clutter-media.c index 1c5f759f7..17494f59c 100644 --- a/clutter/clutter-media.c +++ b/clutter/clutter-media.c @@ -47,8 +47,8 @@ enum { - EOS, - ERROR, + EOS_SIGNAL, + ERROR_SIGNAL, /* can't be called 'ERROR' otherwise it clashes with wingdi.h */ LAST_SIGNAL }; @@ -174,7 +174,7 @@ clutter_media_base_init (gpointer g_iface) * * Since: 0.2 */ - media_signals[EOS] = + media_signals[EOS_SIGNAL] = g_signal_new ("eos", CLUTTER_TYPE_MEDIA, G_SIGNAL_RUN_LAST, @@ -191,7 +191,7 @@ clutter_media_base_init (gpointer g_iface) * * Since: 0.2 */ - media_signals[ERROR] = + media_signals[ERROR_SIGNAL] = g_signal_new ("error", CLUTTER_TYPE_MEDIA, G_SIGNAL_RUN_LAST, @@ -432,7 +432,7 @@ clutter_media_set_filename (ClutterMedia *media, if (uri_error) { - g_signal_emit (media, media_signals[ERROR], 0, uri_error); + g_signal_emit (media, media_signals[ERROR_SIGNAL], 0, uri_error); g_error_free (uri_error); return; }