summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGilles Dartiguelongue <eva@gentoo.org>2010-01-14 23:02:17 +0000
committerGilles Dartiguelongue <eva@gentoo.org>2010-01-14 23:02:17 +0000
commitb625a23d34fae9e82953ffd90483c2d34572b831 (patch)
tree807b75206faf0f3f549861828e50bd8e78dbd8c1 /gnome-extra/gnome-games/files
parentarm stable, bug #294958 (diff)
downloadhistorical-b625a23d34fae9e82953ffd90483c2d34572b831.tar.gz
historical-b625a23d34fae9e82953ffd90483c2d34572b831.tar.bz2
historical-b625a23d34fae9e82953ffd90483c2d34572b831.zip
New version for Gnome 2.28.
Package-Manager: portage-2.2_rc61/cvs/Linux x86_64
Diffstat (limited to 'gnome-extra/gnome-games/files')
-rw-r--r--gnome-extra/gnome-games/files/gnome-games-2.28.1-conflicting-types-libgames-support.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/gnome-extra/gnome-games/files/gnome-games-2.28.1-conflicting-types-libgames-support.patch b/gnome-extra/gnome-games/files/gnome-games-2.28.1-conflicting-types-libgames-support.patch
new file mode 100644
index 000000000000..d8fbe4e05a01
--- /dev/null
+++ b/gnome-extra/gnome-games/files/gnome-games-2.28.1-conflicting-types-libgames-support.patch
@@ -0,0 +1,33 @@
+From: Romain Perier <mrpouet@gentoo.org>
+Date: Sun, 8 Nov 2009 19:27:56 +0100
+Subject: Fix conflicting types for games_sound_init
+
+The problem was caused by two differents functions, matching the same name,
+but without the same proto.
+Usually the commonly way is to prefix static functions by a '_' because this is useful only
+for the implementation.
+
+---
+ libgames-support/games-sound.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/libgames-support/games-sound.c
++++ b/libgames-support/games-sound.c
+@@ -157,7 +157,7 @@ games_sound_canberra_play (const char *sound_name,
+
+ /* Initializes the games-sound support */
+ static void
+-games_sound_init (void)
++_games_sound_init (void)
+ {
+ const int audio_rate = MIX_DEFAULT_FREQUENCY;
+ const int audio_format = MIX_DEFAULT_FORMAT;
+@@ -272,7 +272,7 @@ games_sound_play_for_screen (const gchar * sound_name,
+ if (!sound_enabled)
+ return;
+ if (!sound_init)
+- games_sound_init ();
++ _games_sound_init ();
+
+ games_sound_sdl_play (sound_name);
+ #endif