Module Name: src
Committed By: cegger
Date: Sun Dec 16 14:40:08 UTC 2012
Modified Files:
src/external/lgpl3/gmp/dist: gmp-h.in
Log Message:
Always use extern __inline__ with gcc >= 4.2.
Fall back to prototypes on older gcc versions.
Fixes link errors (duplicate symbols) when mpfr's configure check for libgmp
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/lgpl3/gmp/dist/gmp-h.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl3/gmp/dist/gmp-h.in
diff -u src/external/lgpl3/gmp/dist/gmp-h.in:1.2 src/external/lgpl3/gmp/dist/gmp-h.in:1.3
--- src/external/lgpl3/gmp/dist/gmp-h.in:1.2 Sat Jul 2 14:05:03 2011
+++ src/external/lgpl3/gmp/dist/gmp-h.in Sun Dec 16 14:40:07 2012
@@ -421,10 +421,9 @@ typedef __mpq_struct *mpq_ptr;
GCC 4.3 and above with -std=c99 or -std=gnu99 implements ISO C99
inline semantics, unless -fgnu89-inline is used. */
#ifdef __GNUC__
-#if (defined __GNUC_STDC_INLINE__) || (__GNUC__ == 4 && __GNUC_MINOR__ == 2)
+#if (defined __GNUC_STDC_INLINE__) || \
+ (__GNUC__ == 4 && __GNUC_MINOR__ >= 2) || (__GNUC__ > 4)
#define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
-#else
-#define __GMP_EXTERN_INLINE extern __inline__
#endif
#define __GMP_INLINE_PROTOTYPES 1
#endif
