From 46163e52e5513cf882dafe2bbd05ffbd2b03a755 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Thu, 26 May 2011 15:53:02 +0200 Subject: simplify inline function infrastructure * libguile/__scm.h (SCM_C_EXTERN_INLINE): Move this definition here, from inline.h. We'd like to support inline function definitions in more header files: not just inline.h. (SCM_CAN_INLINE, SCM_INLINE, SCM_INLINE_IMPLEMENTATION): New definitions. * libguile/gc.h (SCM_GC_MALLOC, SCM_GC_MALLOC_POINTERLESS): Define these wrappers, which redirect to the GC_MALLOC macros when building Guile, and the scm_gc_malloc functions otherwise. A step towards getting BDW-GC out of Guile's API. * libguile/inline.h: Simplify, using SCM_INLINE, SCM_INLINE_IMPLEMENTATION, and SCM_IMPLEMENT_INLINES. Also use the new SCM_GC_MALLOC macros. --- libguile/inline.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'libguile/inline.c') diff --git a/libguile/inline.c b/libguile/inline.c index 79728ff13..0c07e926d 100644 --- a/libguile/inline.c +++ b/libguile/inline.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 2001, 2006, 2008, 2011 Free Software Foundation, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -20,5 +20,6 @@ # include #endif -#define SCM_INLINE_C_INCLUDING_INLINE_H 1 +#define SCM_IMPLEMENT_INLINES 1 +#define SCM_INLINE_C_IMPLEMENTING_INLINES 1 #include "libguile/inline.h" -- cgit v1.2.3