From 0001320a753f1afbffa4ee7361a42f8cfaeb938f Mon Sep 17 00:00:00 2001 From: Antonio Rojas Date: Mon, 15 Jan 2024 22:11:16 +0100 Subject: [PATCH] Fix build when linbox is build with fplll support Undefine flint macros that conflict with fplll variables and break build when both are included --- src/sage/libs/flint/flint_wrap.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/sage/libs/flint/flint_wrap.h b/src/sage/libs/flint/flint_wrap.h index a7c6cb399c6..560a1827ed2 100644 --- a/src/sage/libs/flint/flint_wrap.h +++ b/src/sage/libs/flint/flint_wrap.h @@ -168,4 +168,10 @@ #pragma pop_macro("ulong") +/* CPU_SIZE_1 and SIZE_RED_FAILURE_THRESH are defined as macros in flint/fmpz_lll.h + * and as variables in fplll/defs.h, which breaks build if linbox is compiled with fplll */ + +#undef CPU_SIZE_1 +#undef SIZE_RED_FAILURE_THRESH + #endif