From: Javier Sancho Date: Mon, 23 Mar 2020 07:43:33 +0000 (+0100) Subject: Generate different var id for wrapped types X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=6c94796ace41e3973a11126a2dec855e8591fb51;p=guile-irrlicht.git Generate different var id for wrapped types --- diff --git a/src/wrapped.h b/src/wrapped.h index c68b26a..daaaa25 100644 --- a/src/wrapped.h +++ b/src/wrapped.h @@ -38,9 +38,9 @@ PRED (SCM wrapped_obj); -static SCM wrapped_type; - #define DEFINE_WRAPPED_TYPE(TYPE, PRINT_NAME, INIT, PRED, WRAP, UNWRAP) \ + static SCM wrapped_##INIT; \ + \ void \ INIT (void) \ { \ @@ -51,27 +51,27 @@ static SCM wrapped_type; slots = scm_list_1 (scm_from_utf8_symbol ("data")); \ finalizer = NULL; \ \ - wrapped_type = \ + wrapped_##INIT = \ scm_make_foreign_object_type (name, slots, finalizer); \ } \ \ SCM \ WRAP (TYPE foreign_obj) \ { \ - return scm_make_foreign_object_1 (wrapped_type, foreign_obj); \ + return scm_make_foreign_object_1 (wrapped_##INIT, foreign_obj); \ } \ \ TYPE \ UNWRAP (SCM wrapped_obj) \ { \ - scm_assert_foreign_object_type (wrapped_type, wrapped_obj); \ + scm_assert_foreign_object_type (wrapped_##INIT, wrapped_obj); \ return (TYPE)scm_foreign_object_ref (wrapped_obj, 0); \ } \ \ bool \ PRED (SCM wrapped_obj) \ { \ - return SCM_IS_A_P (wrapped_obj, wrapped_type); \ + return SCM_IS_A_P (wrapped_obj, wrapped_##INIT); \ } #endif