[vlc-commits] contrib: gmp: fix duplicate symbol definitions in gnutls
Rafaël Carré
git at videolan.org
Tue Mar 26 15:06:28 CET 2013
vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Mar 26 14:54:33 2013 +0100| [7066acb7539185254d2e4d9c57c830a623ca6a05] | committer: Rafaël Carré
contrib: gmp: fix duplicate symbol definitions in gnutls
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7066acb7539185254d2e4d9c57c830a623ca6a05
---
contrib/src/gmp/inline.diff | 12 ++++++++++++
contrib/src/gmp/rules.mak | 1 +
2 files changed, 13 insertions(+)
diff --git a/contrib/src/gmp/inline.diff b/contrib/src/gmp/inline.diff
new file mode 100644
index 0000000..5d4519f
--- /dev/null
+++ b/contrib/src/gmp/inline.diff
@@ -0,0 +1,12 @@
+--- gmp-4.2.1/gmp-h.in.orig 2013-03-26 14:53:42.132617397 +0100
++++ gmp-4.2.1/gmp-h.in 2013-03-26 14:53:47.424617630 +0100
+@@ -420,8 +420,7 @@
+ for an inline too, so as to correctly specify "dllimport" on windows, in
+ case the function is called rather than inlined. */
+ #ifdef __GNUC__
+-#define __GMP_EXTERN_INLINE extern __inline__
+-#define __GMP_INLINE_PROTOTYPES 1
++#define __GMP_EXTERN_INLINE static __inline__
+ #endif
+
+ /* DEC C (eg. version 5.9) supports "static __inline foo()", even in -std1
diff --git a/contrib/src/gmp/rules.mak b/contrib/src/gmp/rules.mak
index bc1e480..b82faaa 100644
--- a/contrib/src/gmp/rules.mak
+++ b/contrib/src/gmp/rules.mak
@@ -13,6 +13,7 @@ $(TARBALLS)/gmp-$(GMP_VERSION).tar.bz2:
gmp: gmp-$(GMP_VERSION).tar.bz2 .sum-gmp
$(UNPACK)
+ $(APPLY) $(SRC)/gmp/inline.diff
$(UPDATE_AUTOCONFIG)
$(MOVE)
More information about the vlc-commits
mailing list