fix arb headers

sagemath · Oct 13, 2023 · aed25a5 · aed25a5
1 parent d3036aa
commit aed25a5
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 5 deletions.
diff --git a/src/sage/libs/arb/acb.pxd b/src/sage/libs/arb/acb.pxd
@@ -1,6 +1,8 @@
 # Deprecated header file; use sage/libs/flint/acb.pxd instead
 # See https://github.com/sagemath/sage/pull/36449
 
+from sage.libs.flint.types cimport acb_struct, acb_t, acb_ptr, acb_srcptr
+
 from sage.libs.flint.acb cimport (
     acb_realref,
     acb_imagref,

diff --git a/src/sage/libs/arb/acb_calc.pxd b/src/sage/libs/arb/acb_calc.pxd
@@ -1,6 +1,8 @@
 # Deprecated header file; use sage/libs/flint/acb_calc.pxd instead
 # See https://github.com/sagemath/sage/pull/36449
 
+from sage.libs.flint.types cimport acb_calc_integrate_opt_t, acb_calc_func_t
+
 from sage.libs.flint.acb_calc cimport (
     acb_calc_integrate,
     acb_calc_integrate_opt_init)
diff --git a/src/sage/libs/arb/acb_mat.pxd b/src/sage/libs/arb/acb_mat.pxd
@@ -1,6 +1,8 @@
 # Deprecated header file; use sage/libs/flint/acb_mat.pxd instead
 # See https://github.com/sagemath/sage/pull/36449
 
+from sage.libs.flint.types cimport acb_mat_struct, acb_mat_t
+
 from sage.libs.flint.acb_mat cimport (
     acb_mat_nrows,
     acb_mat_ncols,

diff --git a/src/sage/libs/arb/acb_poly.pxd b/src/sage/libs/arb/acb_poly.pxd
@@ -1,6 +1,8 @@
 # Deprecated header file; use sage/libs/flint/acb_poly.pxd instead
 # See https://github.com/sagemath/sage/pull/36449
 
+from sage.libs.flint.types cimport acb_poly_struct, acb_poly_t
+
 from sage.libs.flint.acb_poly cimport (
     acb_poly_init,
     acb_poly_clear,

diff --git a/src/sage/libs/arb/arb.pxd b/src/sage/libs/arb/arb.pxd
@@ -1,6 +1,8 @@
 # Deprecated header file; use sage/libs/flint/arb.pxd instead
 # See https://github.com/sagemath/sage/pull/36449
 
+from sage.libs.flint.types cimport arb_struct, arb_t, arb_ptr, arb_srcptr
+
 from sage.libs.flint.arb cimport (
     arb_midref,
     arb_radref,
@@ -21,6 +23,7 @@ from sage.libs.flint.arb cimport (
     arb_get_str,
     arb_zero,
     arb_one,
+    arb_dump_str,
     arb_pos_inf,
     arb_neg_inf,
     arb_zero_pm_inf,

diff --git a/src/sage/libs/arb/arb_version.pyx b/src/sage/libs/arb/arb_version.pyx
@@ -1,7 +1,11 @@
 # -*- coding: utf-8
-from sage.libs.arb.arb cimport arb_version
 from sage.cpython.string cimport char_to_str
 
+
+cdef extern from "arb_wrap.h":
+    char * arb_version
+
+
 def version():
     """
     Get arb version

diff --git a/src/sage/libs/arb/arf.pxd b/src/sage/libs/arb/arf.pxd
@@ -1,6 +1,8 @@
 # Deprecated header file; use sage/libs/flint/arf.pxd instead
 # See https://github.com/sagemath/sage/pull/36449
 
+from sage.libs.flint.types cimport arf_t
+
 from sage.libs.flint.arf cimport (
     arf_init,
     arf_clear,

diff --git a/src/sage/libs/arb/mag.pxd b/src/sage/libs/arb/mag.pxd
@@ -1,7 +1,10 @@
 # Deprecated header file; use sage/libs/flint/mag.pxd instead
 # See https://github.com/sagemath/sage/pull/36449
 
+from sage.libs.flint.types cimport mag_t
+
 from sage.libs.flint.mag cimport (
+    MAG_BITS,
     mag_init,
     mag_clear,
     mag_init_set,

diff --git a/src/sage/libs/arb/types.pxd b/src/sage/libs/arb/types.pxd
@@ -3,10 +3,9 @@
 
 from sage.libs.flint.types cimport (
     mag_struct,
-    mag_struct mag_t,
+    mag_t,
     mag_ptr,
     mag_srcptr,
-    MAG_BITS,
     arf_struct,
     arf_t,
     arf_ptr,
@@ -22,7 +21,7 @@ from sage.libs.flint.types cimport (
     arb_t,
     arb_ptr,
     arb_srcptr,
-    acb_struct
+    acb_struct,
     acb_t,
     acb_ptr,
     acb_srcptr,
@@ -39,4 +38,3 @@ from sage.libs.flint.types cimport (
     arb_poly_t,
     arb_poly_ptr,
     arb_poly_srcptr)
-