From e3320067a9d15cedba958cb247b3887d444a87d4 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Wed, 4 Aug 2010 12:50:07 -0600 Subject: [PATCH] clean up gmp _EXTERN_INLINE problem --- src/racket/src/gmp/gmp.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/racket/src/gmp/gmp.h b/src/racket/src/gmp/gmp.h index 45628b5991..e5f5743bb2 100644 --- a/src/racket/src/gmp/gmp.h +++ b/src/racket/src/gmp/gmp.h @@ -66,10 +66,11 @@ MA 02111-1307, USA. */ #endif #ifndef _EXTERN_INLINE -#ifdef __GNUC__ +/* __GNUC__ case disabled to avoid unnecessary compiler dependencies */ +#if defined(__GNUC__) && 0 #define _EXTERN_INLINE extern __inline__ #else -#define _EXTERN_INLINE static +#define _EXTERN_INLINE static __gmp_inline #endif #endif @@ -283,8 +284,8 @@ extern __gmp_const int mp_bits_per_limb; #if defined (__cplusplus) extern "C" { #endif -mp_limb_t mpn_add _PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr,mp_size_t)); -mp_limb_t mpn_add_1 _PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t)); +_EXTERN_INLINE mp_limb_t mpn_add _PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr,mp_size_t)); +_EXTERN_INLINE mp_limb_t mpn_add_1 _PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t)); mp_limb_t mpn_add_n _PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t)); mp_limb_t mpn_add_nc _PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t, mp_limb_t)); @@ -353,8 +354,8 @@ mp_size_t mpn_set_str _PROTO ((mp_ptr, __gmp_const unsigned char *, size_t, int) void mpn_sqr_n _PROTO ((mp_ptr, mp_srcptr, mp_size_t)); void mpn_sqr_basecase _PROTO ((mp_ptr, mp_srcptr, mp_size_t)); mp_size_t mpn_sqrtrem _PROTO ((mp_ptr, mp_ptr, mp_srcptr, mp_size_t)); -mp_limb_t mpn_sub _PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr,mp_size_t)); -mp_limb_t mpn_sub_1 _PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t)); +_EXTERN_INLINE mp_limb_t mpn_sub _PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_srcptr,mp_size_t)); +_EXTERN_INLINE mp_limb_t mpn_sub_1 _PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t)); mp_limb_t mpn_sub_n _PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t)); mp_limb_t mpn_sub_nc _PROTO ((mp_ptr, mp_srcptr, mp_srcptr, mp_size_t, mp_limb_t)); mp_limb_t mpn_submul_1 _PROTO ((mp_ptr, mp_srcptr, mp_size_t, mp_limb_t));