From f0441ebe3febbf8d3aea1b1502b40df262a5ceff Mon Sep 17 00:00:00 2001 From: System User Date: Tue, 12 Jan 2010 10:14:18 +0100 Subject: [PATCH] * solve an inline problem with the gcc3.4 compiler used at SOLEIL --- include/hkl/hkl-macros.h | 11 +---------- src/usage.c | 11 +++++++++++ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/hkl/hkl-macros.h b/include/hkl/hkl-macros.h index aeb2c88d..d89e670f 100644 --- a/include/hkl/hkl-macros.h +++ b/include/hkl/hkl-macros.h @@ -115,16 +115,7 @@ extern void warning(const char *err, ...); extern void hkl_printbt(void); -__inline__ void *_hkl_malloc(int size, const char *error) -{ - void *tmp; - - tmp = calloc(1, size); - if(!tmp) - die("%s", error); - - return tmp; -} +__inline__ void *_hkl_malloc(int size, const char *error); HKL_END_DECLS diff --git a/src/usage.c b/src/usage.c index 7ece0a4b..08434685 100644 --- a/src/usage.c +++ b/src/usage.c @@ -97,3 +97,14 @@ void hkl_printbt(void) free(strings); } + +__inline__ void *_hkl_malloc(int size, const char *error) +{ + void *tmp; + + tmp = calloc(1, size); + if(!tmp) + die("%s", error); + + return tmp; +} -- 2.11.4.GIT