Add once-guard to ensure that the file is processed only once. Add arch-guard to ensure that DEF_<ARCH> is always defined to prevent an issue that symbols defined via F32() macro completely disappeared and which was fixed in previous change.
This change applied before the previous change cause compile errors. --- mingw-w64-crt/def-include/func.def.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/mingw-w64-crt/def-include/func.def.in b/mingw-w64-crt/def-include/func.def.in index a5a4efada6d0..97d18e524d93 100644 --- a/mingw-w64-crt/def-include/func.def.in +++ b/mingw-w64-crt/def-include/func.def.in @@ -1,3 +1,6 @@ +#ifndef FUNC_DEF_IN +#define FUNC_DEF_IN + // F32 - function available on all 32 bit architectures // F64 - function available on all 64 bit architectures // F_X86_ANY - function available on i386 and x86_64 @@ -26,6 +29,8 @@ #define F_ARM64(x) x #define F_ARM_ANY(x) x #define F_NON_I386(x) x +#else +#error No DEF_<ARCH> is defined #endif #ifndef F32 @@ -60,3 +65,5 @@ // for __cdecl and __stdcall only #define DECORATED_EXPORT(symbol) symbol == _ ## symbol #endif + +#endif // FUNC_DEF_IN -- 2.20.1 _______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
