Skip to content

Commit

Permalink
sagemathgh-37064: Fix build when linbox is build with fplll support
Browse files Browse the repository at this point in the history
    
Undefine flint macros that conflict with fplll variables and break build
when both are included

See sagemath#36449 (comment)
    
URL: sagemath#37064
Reported by: Antonio Rojas
Reviewer(s): Tobias Diez, Vincent Delecroix
  • Loading branch information
Release Manager committed Jan 20, 2024
2 parents ba225a8 + 0001320 commit d79e87b
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions src/sage/libs/flint/flint_wrap.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit d79e87b

Please sign in to comment.