Re: libgmp: duplicate symbol

[Christoph Egger <Christoph_Egger%gmx.de@localhost>]

> On Thu, Dec 13, 2012 at 09:42:29PM +0100, Christoph Egger wrote:
>> Do you think upstream would accept this?
> 
> Ask them?
> 
>> Index: external/lgpl3/gmp/dist/gmp-h.in
>> ===================================================================
>> RCS file: /cvsroot/src/external/lgpl3/gmp/dist/gmp-h.in,v
>> retrieving revision 1.2
>> diff -u -p -r1.2 gmp-h.in
>> --- external/lgpl3/gmp/dist/gmp-h.in    2 Jul 2011 14:05:03 -0000       1.2
>> +++ external/lgpl3/gmp/dist/gmp-h.in    13 Dec 2012 20:41:28 -0000
>> @@ -421,10 +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)
>>  #define __GMP_EXTERN_INLINE extern __inline__ __attribute__ 
>> ((__gnu_inline__))
>> -#else
>> -#define __GMP_EXTERN_INLINE      extern __inline__
>>  #endif
>>  #define __GMP_INLINE_PROTOTYPES  1
>>  #endif
> 
> __GNUC__ > 4 as well, I would guess.
> 
> Joerg


So this should be fine to commit I guess:

Index: external/lgpl3/gmp/dist/gmp-h.in
===================================================================
RCS file: /cvsroot/src/external/lgpl3/gmp/dist/gmp-h.in,v
retrieving revision 1.2
diff -u -p -r1.2 gmp-h.in
--- external/lgpl3/gmp/dist/gmp-h.in    2 Jul 2011 14:05:03 -0000       1.2
+++ external/lgpl3/gmp/dist/gmp-h.in    14 Dec 2012 10:06:51 -0000
@@ -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


Christoph