Workaround to allow flint to be compiled with numpy 2

vbraun · Jan 6, 2025 · e88cac0 · e88cac0
1 parent 1be0a58
commit e88cac0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/sage/libs/flint/flint_wrap.h b/src/sage/libs/flint/flint_wrap.h
@@ -26,6 +26,10 @@
 #pragma push_macro("ulong")
 #undef ulong
 
+/* Reserved in C99, needed for FLINT without https://github.com/flintlib/flint/pull/2027 */
+#pragma push_macro("I")
+#define I Iv
+
 #include <flint/flint.h>
 
 /* If flint was already previously included via another header (e.g.
@@ -169,6 +173,7 @@
 #undef mp_bitcnt_t
 
 #pragma pop_macro("ulong")
+#pragma pop_macro("I")
 
 /* 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 */

diff --git a/src/sage_setup/autogen/flint/templates/flint_wrap.h.template b/src/sage_setup/autogen/flint/templates/flint_wrap.h.template
@@ -26,6 +26,10 @@
 #pragma push_macro("ulong")
 #undef ulong
 
+/* Reserved in C99, needed for FLINT without https://github.com/flintlib/flint/pull/2027 */
+#pragma push_macro("I")
+#define I Iv
+
 #include <flint/flint.h>
 
 /* If flint was already previously included via another header (e.g.
@@ -43,6 +47,7 @@
 #undef mp_bitcnt_t
 
 #pragma pop_macro("ulong")
+#pragma pop_macro("I")
 
 /* 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 */