From 8ba45c60126568edaceaff544529cbfae532a235 Mon Sep 17 00:00:00 2001 From: Aleksey Demakov Date: Sat, 7 Feb 2009 16:45:18 +0000 Subject: [PATCH] for each jit_apply_ macro add individual check if it's already defined --- ChangeLog | 2 ++ jit/jit-apply-func.h | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4b69177..6598bce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20,6 +20,8 @@ override jit_builtin_apply. * jit/jit-apply-arm.c (_jit_create_indirector, _jit_pad_buffer): add functions. + * jit/jit-apply-func.h: for each jit_builtin_* macro add individual + check if it's already defined. 2009-01-30 Peter Fristedt Kirill Kononenko diff --git a/jit/jit-apply-func.h b/jit/jit-apply-func.h index 707e2af..0cf1926 100644 --- a/jit/jit-apply-func.h +++ b/jit/jit-apply-func.h @@ -42,43 +42,53 @@ #endif #if !defined(jit_builtin_apply) - #define jit_builtin_apply(func,args,size,return_float,return_buf) \ do { \ (return_buf) = __builtin_apply \ ((void (*)())(func), (args), (size)); \ } while (0) +#endif +#if !defined(jit_builtin_apply_args) #define jit_builtin_apply_args(type,args) \ do { \ (args) = (type)__builtin_apply_args(); \ } while (0) +#endif +#if !defined(jit_builtin_return_int) #define jit_builtin_return_int(return_buf) \ do { \ __builtin_return((return_buf)); \ } while (0) +#endif +#if !defined(jit_builtin_return_long) #define jit_builtin_return_long(return_buf) \ do { \ __builtin_return((return_buf)); \ } while (0) +#endif +#if !defined(jit_builtin_return_float) #define jit_builtin_return_float(return_buf) \ do { \ __builtin_return((return_buf)); \ } while (0) +#endif +#if !defined(jit_builtin_return_double) #define jit_builtin_return_double(return_buf) \ do { \ __builtin_return((return_buf)); \ } while (0) +#endif +#if !defined(jit_builtin_return_nfloat) #define jit_builtin_return_nfloat(return_buf) \ do { \ __builtin_return((return_buf)); \ } while (0) - #endif /*