Do not expand macros to 'defined'

Expanding a macro which contains 'defined' PP keyword is UB.  It causes
a compilation failure when -Wexpansion-to-defined is used.

sim/common/Changelog:
2019-01-16  Pavel I. Kryukov  <kryukov@frtk.ru>

	* sim-arange.c: eliminate DEFINE_NON_INLINE_P
This commit is contained in:
Pavel I. Kryukov 2019-01-16 16:04:34 -05:00 committed by Simon Marchi
parent c24bdb023c
commit 7516c26f86
2 changed files with 7 additions and 5 deletions

View File

@ -1,3 +1,7 @@
2019-01-16 Pavel I. Kryukov <kryukov@frtk.ru>
* sim-arange.c: eliminate DEFINE_NON_INLINE_P
2019-01-15 Simon Marchi <simon.marchi@ericsson.com>
* sim-arange.h (SIM_ARANGE_INLINE): Change EXTERN to extern.

View File

@ -35,7 +35,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#define DEFINE_INLINE_P (! defined (SIM_ARANGE_C_INCLUDED))
#define DEFINE_NON_INLINE_P defined (SIM_ARANGE_C_INCLUDED)
#if DEFINE_NON_INLINE_P
#ifdef SIM_ARANGE_C_INCLUDED
/* Insert a range. */
@ -280,9 +280,7 @@ sim_addr_range_delete (ADDR_RANGE *ar, address_word start, address_word end)
build_search_tree (ar);
}
#endif /* DEFINE_NON_INLINE_P */
#if DEFINE_INLINE_P
#else /* SIM_ARANGE_C_INCLUDED */
SIM_ARANGE_INLINE int
sim_addr_range_hit_p (ADDR_RANGE *ar, address_word addr)
@ -301,4 +299,4 @@ sim_addr_range_hit_p (ADDR_RANGE *ar, address_word addr)
return 0;
}
#endif /* DEFINE_INLINE_P */
#endif /* SIM_ARANGE_C_INCLUDED */