From 84a24a69834a5800be0e2a208d10741cfbcaa495 Mon Sep 17 00:00:00 2001 From: bstarynk Date: Wed, 4 May 2016 09:23:15 +0000 Subject: 2016-05-04 Basile Starynkevitch * melt-runtime.cc (melt_alptr_1, melt_alptr_2, melt_objhash_1) (melt_objhash_2): Declare them if they are not macro, even without MELT_HAVE_DEBUG.. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@235864 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog.MELT | 5 +++++ gcc/melt-runtime.cc | 11 +++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog.MELT b/gcc/ChangeLog.MELT index 1e4cde88389..d9261caeb5b 100644 --- a/gcc/ChangeLog.MELT +++ b/gcc/ChangeLog.MELT @@ -1,4 +1,9 @@ +2016-05-04 Basile Starynkevitch + * melt-runtime.cc (melt_alptr_1, melt_alptr_2, melt_objhash_1) + (melt_objhash_2): Declare them if they are not macro, even without + MELT_HAVE_DEBUG.. + 2016-05-04 Basile Starynkevitch * melt-runtime.h (meltgc_allocate, melt_allocatereserved): Use melt_alptr_1 ... only when MELT_HAVE_DEBUG > 0. diff --git a/gcc/melt-runtime.cc b/gcc/melt-runtime.cc index 09142a558cc..ba463cec140 100644 --- a/gcc/melt-runtime.cc +++ b/gcc/melt-runtime.cc @@ -161,13 +161,20 @@ const int melt_gccplugin_version = GCCPLUGIN_VERSION; const int melt_gccplugin_version = 0; #endif -#if MELT_HAVE_DEBUG > 0 /* For debugging purposes, used thru gdb. */ +// for some reason, I need to declare these even when MELT_HAVE_DEBUG is 0 +#ifndef melt_alptr_1 void *melt_alptr_1=NULL; +#endif +#ifndef melt_alptr_2 void *melt_alptr_2=NULL; +#endif +#ifndef melt_objhash_1 unsigned melt_objhash_1=0; +#endif +#ifndef melt_objhash_2 unsigned melt_objhash_2=0; -#endif /* MELT_HAVE_DEBUG */ +#endif int melt_count_runtime_extensions; -- cgit v1.2.1