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

diff --git a/ChangeLog b/ChangeLog
index e8f46b8..e21f73c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2008-11-21  Neil Roberts  <neil@linux.intel.com>
 
+       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  <neil@linux.intel.com>
+
        * clutter/pango/cogl-pango.h: Include pango/pango.h to get
        pango-renderer.h. In versions prior to 1.18.4 pangocairo.h does
        not include pango-renderer.h

diff --git a/clutter/clutter-media.c b/clutter/clutter-media.c
index 1c5f759..17494f5 100644 (file)
--- 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;
     }