summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Glisse <marc.glisse@inria.fr>2011-05-01 15:19:10 +0200
committerMarc Glisse <marc.glisse@inria.fr>2011-05-01 15:19:10 +0200
commit80ae514baf0861ae745bd9ea534417be3693092f (patch)
tree4c0f030d2ba5081ef97ab24c7329da2008ba6d69
parentb73927b28d7cfce8921fe0be925605202747ae94 (diff)
downloadgmp-80ae514baf0861ae745bd9ea534417be3693092f.tar.gz
Let recent g++ use gnu_inline.
-rw-r--r--ChangeLog2
-rw-r--r--gmp-h.in3
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 24b17a9e7..04db246ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
* doc/gmp.texi (mpf_urandomb): Explicit the fact that it does not
change the precision.
+ * gmp-h.in (__GMP_EXTERN_INLINE): Recent g++ uses gnu_inline.
+
2011-04-28 Torbjorn Granlund <tege@gmplib.org>
* configure.in (x86_64): Support bobcat specifically.
diff --git a/gmp-h.in b/gmp-h.in
index fda6dfbcb..d5d2d17c2 100644
--- a/gmp-h.in
+++ b/gmp-h.in
@@ -421,7 +421,8 @@ 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) \
+ || (defined __GNUC_GNU_INLINE__ && defined __cplusplus)
#define __GMP_EXTERN_INLINE extern __inline__ __attribute__ ((__gnu_inline__))
#else
#define __GMP_EXTERN_INLINE extern __inline__