[vlc-commits] contrib: gme: fix android build

[Rafaël Carré]

vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Mon Dec 26 21:10:39 2011 -0500| [52d45ab6b8b284af68b9cbdc04c9a08e96108586] | committer: Jean-Baptiste Kempf

contrib: gme: fix android build

gcc doesn't understand __restrict, use __restrict__
might break MSVC++ compatibility
(cherry picked from commit 37b428889762b86e3ab9afed4367e9a8882b87e2)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=52d45ab6b8b284af68b9cbdc04c9a08e96108586
---

 contrib/src/gme/android.patch |   11 +++++++++++
 contrib/src/gme/rules.mak     |    1 +
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/contrib/src/gme/android.patch b/contrib/src/gme/android.patch
new file mode 100644
index 0000000..f615a7d
--- /dev/null
+++ b/contrib/src/gme/android.patch
@@ -0,0 +1,11 @@
+--- game-music-emu/gme/Blip_Buffer.h.orig	2011-12-25 22:27:15.546377001 -0500
++++ game-music-emu/gme/Blip_Buffer.h	2011-12-25 22:27:37.146377002 -0500
+@@ -268,7 +268,7 @@
+ };
+ 
+ 	#if defined (__GNUC__) || _MSC_VER >= 1100
+-		#define BLIP_RESTRICT __restrict
++		#define BLIP_RESTRICT __restrict__
+ 	#else
+ 		#define BLIP_RESTRICT
+ 	#endif
diff --git a/contrib/src/gme/rules.mak b/contrib/src/gme/rules.mak
index ac5dcc5..ce633b8 100644
--- a/contrib/src/gme/rules.mak
+++ b/contrib/src/gme/rules.mak
@@ -13,6 +13,7 @@ $(TARBALLS)/game-music-emu-$(GME_VERSION).tar.bz2:
 game-music-emu: game-music-emu-$(GME_VERSION).tar.bz2 .sum-gme
 	$(UNPACK)
 	$(APPLY) $(SRC)/gme/gme-static.patch
+	$(APPLY) $(SRC)/gme/android.patch
 	$(MOVE)
 
 .gme: game-music-emu toolchain.cmake