Restore compilation wit flintlib 3.1

tornaria · Feb 5, 2025 · d8d87fd · d8d87fd
1 parent a606af0
commit d8d87fd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/src/sage/libs/flint/flint_wrap.h b/src/sage/libs/flint/flint_wrap.h
@@ -30,6 +30,10 @@
 #pragma push_macro("I")
 #define I Iv
 
+/* flint 3.2 will rename flint_rand_s to flint_rand_struct
+ * the following line can be removed when flint 3.1 is gone */
+#define flint_rand_s flint_rand_struct
+
 #include <flint/flint.h>
 
 /* If flint was already previously included via another header (e.g.

diff --git a/src/sage_setup/autogen/flint/templates/flint_sage.pyx.template b/src/sage_setup/autogen/flint/templates/flint_sage.pyx.template
@@ -12,7 +12,7 @@ Import this module::
 
     sage: import sage.libs.flint.flint_sage
 
-We verify that :trac:`6919` is correctly fixed::
+We verify that :issue:`6919` is correctly fixed::
 
     sage: R.<x> = PolynomialRing(ZZ)
     sage: A = 2^(2^17+2^15)

diff --git a/src/sage_setup/autogen/flint/templates/flint_wrap.h.template b/src/sage_setup/autogen/flint/templates/flint_wrap.h.template
@@ -30,6 +30,10 @@
 #pragma push_macro("I")
 #define I Iv
 
+/* flint 3.2 will rename flint_rand_s to flint_rand_struct
+ * the following line can be removed when flint 3.1 is gone */
+#define flint_rand_s flint_rand_struct
+
 #include <flint/flint.h>
 
 /* If flint was already previously included via another header (e.g.

diff --git a/src/sage_setup/autogen/flint/templates/types.pxd.template b/src/sage_setup/autogen/flint/templates/types.pxd.template
@@ -266,9 +266,9 @@ cdef extern from "flint_wrap.h":
 
 
     # flint/flint.h
-    ctypedef struct flint_rand_s:
+    ctypedef struct flint_rand_struct:
         pass
-    ctypedef flint_rand_s flint_rand_t[1]
+    ctypedef flint_rand_struct flint_rand_t[1]
 
     cdef long FLINT_BITS
     cdef long FLINT_D_BITS