summaryrefslogtreecommitdiff
path: root/libguile/inline.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2011-05-26 15:53:02 +0200
committerAndy Wingo <wingo@pobox.com>2012-03-08 12:40:27 +0100
commit46163e52e5513cf882dafe2bbd05ffbd2b03a755 (patch)
tree670f91a5e70e1949ebd45655183bfef257c8d0c2 /libguile/inline.c
parentbe79627c21ba0848af3ac7bea25293170fec6480 (diff)
downloadguile-46163e52e5513cf882dafe2bbd05ffbd2b03a755.tar.gz
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.
Diffstat (limited to 'libguile/inline.c')
-rw-r--r--libguile/inline.c5
1 files changed, 3 insertions, 2 deletions
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 <config.h>
#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"