From 33f2c23c0534250d1845c9fe96d72cdd63bb86ff Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 30 Dec 2013 15:20:30 -0700 Subject: [PATCH] workaround clang problem Using MZ_INLINE on scheme_get_realint_val() and scheme_get_unsigned_realint_val() leads to a link error when using the current clang on Mac OS X 10.9. Remove the MZ_INLINE declaration, since a modern C compiler will inline, anyway. --- racket/src/foreign/foreign.c | 4 ++-- racket/src/foreign/foreign.rktc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/racket/src/foreign/foreign.c b/racket/src/foreign/foreign.c index 2302205ff0..7260597b7d 100644 --- a/racket/src/foreign/foreign.c +++ b/racket/src/foreign/foreign.c @@ -492,7 +492,7 @@ static Scheme_Object *foreign_ffi_obj_name(int argc, Scheme_Object *argv[]) /* These will make sense in Racket when longs are longer than ints (needed * for libffi's int32 types). There is no need to deal with bignums because * racket's fixnums are longs. */ -XFORM_NONGCING MZ_INLINE int scheme_get_realint_val(Scheme_Object *o, int *v) +XFORM_NONGCING int scheme_get_realint_val(Scheme_Object *o, int *v) { if (SCHEME_INTP(o)) { uintptr_t lv = SCHEME_INT_VAL(o); @@ -503,7 +503,7 @@ XFORM_NONGCING MZ_INLINE int scheme_get_realint_val(Scheme_Object *o, int *v) return 1; } else return 0; } -XFORM_NONGCING MZ_INLINE int scheme_get_unsigned_realint_val(Scheme_Object *o, unsigned int *v) +XFORM_NONGCING int scheme_get_unsigned_realint_val(Scheme_Object *o, unsigned int *v) { if (SCHEME_INTP(o)) { uintptr_t lv = SCHEME_INT_VAL(o); diff --git a/racket/src/foreign/foreign.rktc b/racket/src/foreign/foreign.rktc index 14b44dc080..457fd4985c 100755 --- a/racket/src/foreign/foreign.rktc +++ b/racket/src/foreign/foreign.rktc @@ -409,7 +409,7 @@ static uintptr_t adjustment; /* These will make sense in Racket when longs are longer than ints (needed * for libffi's int32 types). There is no need to deal with bignums because * racket's fixnums are longs. */ -XFORM_NONGCING MZ_INLINE int scheme_get_realint_val(Scheme_Object *o, int *v) +XFORM_NONGCING int scheme_get_realint_val(Scheme_Object *o, int *v) { if (SCHEME_INTP(o)) { uintptr_t lv = SCHEME_INT_VAL(o); @@ -420,7 +420,7 @@ XFORM_NONGCING MZ_INLINE int scheme_get_realint_val(Scheme_Object *o, int *v) return 1; } else return 0; } -XFORM_NONGCING MZ_INLINE int scheme_get_unsigned_realint_val(Scheme_Object *o, unsigned int *v) +XFORM_NONGCING int scheme_get_unsigned_realint_val(Scheme_Object *o, unsigned int *v) { if (SCHEME_INTP(o)) { uintptr_t lv = SCHEME_INT_VAL(o);