=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v retrieving revision 1.70 retrieving revision 1.76 diff -u -p -r1.70 -r1.76 --- OpenXM_contrib2/asir2000/include/ca.h 2008/08/11 16:23:24 1.70 +++ OpenXM_contrib2/asir2000/include/ca.h 2009/03/16 16:43:03 1.76 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.69 2008/08/08 11:16:34 ohara Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.75 2009/02/05 08:37:02 ohara Exp $ */ #include #include @@ -153,7 +153,7 @@ typedef enum { A_end=0,A_fnode,A_arf,A_int,A_str,A_internal,A_node,A_notimpl,A_func } farg_type; -#if defined(LONG_IS_32BIT) +#if SIZEOF_LONG == 4 #if defined(VISUAL) typedef _int64 L; typedef unsigned _int64 UL; @@ -625,6 +625,7 @@ struct order_spec { int id; Obj obj; int nv; + int ispot; /* 1 means Position over Term (Pos then Term) */ union { int simple; struct { @@ -1426,6 +1427,8 @@ LUM LUMALLOC(int, int); BM BMALLOC(int, int); Obj ToAlg(Num); UM *berlemain(register int, UM, UM *); +void Risa_GC_set_adj(int,int); +void Risa_GC_get_adj(int *,int *); void *Risa_GC_malloc(size_t); void *Risa_GC_malloc_atomic(size_t); void *Risa_GC_realloc(void *,size_t); @@ -2642,3 +2645,8 @@ void addnbp(VL vl,NBP p1,NBP p2, NBP *rp); void mulnbp(VL vl,NBP p1,NBP p2, NBP *rp); void pwrnbp(VL vl,NBP p1,Q n, NBP *rp); int compnbp(VL vl,NBP p1,NBP p2); + +#if defined(PARI23) +#define prec precreal +#define mppgcd(a,b) (gcdii((a),(b))) +#endif