mirror of
https://src.fedoraproject.org/rpms/sagemath.git
synced 2025-04-22 03:39:03 -04:00
35 lines
2.6 KiB
Diff
35 lines
2.6 KiB
Diff
diff -up src/sage/libs/singular/decl.pxd.orig src/sage/libs/singular/decl.pxd
|
|
--- src/sage/libs/singular/decl.pxd.orig 2017-03-29 14:40:18.119445065 -0400
|
|
+++ src/sage/libs/singular/decl.pxd 2017-03-29 14:42:36.153450351 -0400
|
|
@@ -484,8 +484,8 @@ cdef extern from "singular/Singular/libs
|
|
|
|
ring *rDefault(int char , int nvars, char **names)
|
|
ring *rDefault(const n_Procs_s* cf, int nvars, char **names)
|
|
- ring *rDefault(int ch , int nvars, char **names,int ord_size, int *ord, int *block0, int *block1, int **wvhdl)
|
|
- ring *rDefault(const n_Procs_s* cf, int nvars, char **names,int ord_size, int *ord, int *block0, int *block1, int **wvhdl)
|
|
+ ring *rDefault(int ch , int nvars, char **names,int ord_size, rRingOrder_t *ord, int *block0, int *block1, int **wvhdl)
|
|
+ ring *rDefault(const n_Procs_s* cf, int nvars, char **names,int ord_size, rRingOrder_t *ord, int *block0, int *block1, int **wvhdl)
|
|
|
|
|
|
|
|
diff -up src/sage/libs/singular/ring.pyx.orig src/sage/libs/singular/ring.pyx
|
|
--- src/sage/libs/singular/ring.pyx.orig 2017-03-29 14:40:24.767445320 -0400
|
|
+++ src/sage/libs/singular/ring.pyx 2017-03-29 14:43:38.593452742 -0400
|
|
@@ -21,7 +21,7 @@ from sage.libs.gmp.mpz cimport mpz_init_
|
|
from sage.libs.singular.decl cimport number, poly, ring, currRing
|
|
from sage.libs.singular.decl cimport rChangeCurrRing, rCopy0, rComplete, rDelete, idInit
|
|
from sage.libs.singular.decl cimport omAlloc0, omStrDup, omAlloc, omAlloc0Bin, sip_sring_bin, rnumber_bin
|
|
-from sage.libs.singular.decl cimport ringorder_dp, ringorder_Dp, ringorder_lp, ringorder_rp, ringorder_ds, ringorder_Ds, ringorder_ls, ringorder_M, ringorder_C, ringorder_wp, ringorder_Wp, ringorder_ws, ringorder_Ws, ringorder_a
|
|
+from sage.libs.singular.decl cimport rRingOrder_t, ringorder_dp, ringorder_Dp, ringorder_lp, ringorder_rp, ringorder_ds, ringorder_Ds, ringorder_ls, ringorder_M, ringorder_C, ringorder_wp, ringorder_Wp, ringorder_ws, ringorder_Ws, ringorder_a
|
|
from sage.libs.singular.decl cimport p_Copy, prCopyR
|
|
from sage.libs.singular.decl cimport n_unknown, n_Zp, n_Q, n_R, n_GF, n_long_R, n_algExt,n_transExt,n_long_C, n_Z, n_Zn, n_Znm, n_Z2m, n_CF
|
|
from sage.libs.singular.decl cimport n_coeffType, cfInitCharProc
|
|
@@ -165,7 +165,7 @@ cdef ring *singular_ring_new(base_ring,
|
|
## q q : GF(q=p^n) *names TRUE (todo)
|
|
|
|
_wvhdl = <int **>omAlloc0((nblcks + 2) * sizeof(int *))
|
|
- _order = <int *>omAlloc0((nblcks + 2) * sizeof(int))
|
|
+ _order = <rRingOrder_t *>omAlloc0((nblcks + 2) * sizeof(rRingOrder_t))
|
|
_block0 = <int *>omAlloc0((nblcks + 2) * sizeof(int))
|
|
_block1 = <int *>omAlloc0((nblcks + 2) * sizeof(int))
|
|
|