Clashing #define SBE_BOUNDS_CHECK_EXPECT from two schemas

[samkhopkar]

We are using an internal SBE schema and an external CME defined schema and using SBE 1.23.1.1 When code is generated for both and generated headers included the following #define SBE_BOUNDS_CHECK_EXPECT clashes

#if defined(SBE_NO_BOUNDS_CHECK)
#  define SBE_BOUNDS_CHECK_EXPECT(exp, c) (false)
#elif defined(_MSC_VER)
#  define SBE_BOUNDS_CHECK_EXPECT(exp, c) (exp)
#else
#  define SBE_BOUNDS_CHECK_EXPECT(exp, c) (__builtin_expect(exp, c))
#endif

Can this be changed in future version to check if it is already defined in the generated header

#if defined(SBE_NO_BOUNDS_CHECK)
#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (false)
#elif defined(_MSC_VER)
#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (exp)
#elif !defined(SBE_BOUNDS_CHECK_EXPECT)  <=======================================Check if already defined
#  define SBE_BOUNDS_CHECK_EXPECT(exp,c) (__builtin_expect(exp,c))
#endif