===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.93
retrieving revision 1.99
diff -u -p -r1.93 -r1.99
--- OpenXM_contrib2/asir2000/include/ca.h	2015/08/14 13:51:55	1.93
+++ OpenXM_contrib2/asir2000/include/ca.h	2017/02/07 08:30:31	1.99
@@ -45,12 +45,13 @@
  * 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.92 2015/08/06 10:39:13 fujimoto Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.98 2017/01/08 03:05:40 noro Exp $ 
 */
 #include <stdio.h>
 #include <stdlib.h>
 #include <gmp.h>
-#include <mpfr.h>
+#include <mpc.h>
+#include <limits.h>
 
 /* from mpfr-impl.h */
 #define MPFR_PREC(x)      ((x)->_mpfr_prec)
@@ -59,6 +60,10 @@
 #define MPFR_LAST_LIMB(x) ((MPFR_PREC (x) - 1) / GMP_NUMB_BITS)
 #define MPFR_LIMB_SIZE(x) (MPFR_LAST_LIMB (x) + 1)
 
+#define RAT_CEIL(nm,dn) (((nm)+(dn)-1)/((dn)))
+#define MPFR_LIMB_SIZE_REAL(x) (RAT_CEIL(MPFR_PREC((x)),sizeof(mp_limb_t)*CHAR_BIT) * (sizeof(mp_limb_t)/sizeof(int)) )
+#define MPFR_LIMB_SIZE_BODY(x) (RAT_CEIL(MPFR_PREC((x)),sizeof(unsigned int)*CHAR_BIT))
+
 #if defined(hpux)
 #include <netinet/in.h>
 # define setbuffer(FP,buf,siz) setvbuf(FP,buf,_IOFBF,siz)
@@ -663,6 +668,9 @@ struct order_spec {
 	int nv;
 	int ispot; /* 1 means Position over Term (Pos then Term) */
 	int pot_nelim; /* size of positions for pot-elimination order */
+  int *top_weight;
+  int module_rank;
+  int *module_top_weight;
 	union {
 		int simple;
 		struct {
@@ -778,8 +786,17 @@ typedef unsigned int ModNum;
 #define ALLOCA(d) MALLOC(d)
 #endif
 
+/* for handling signals */
+#if defined(HAVE_SIGACTION)  /* POSIX */
+void (*set_signal(int sig, void (*handler)(int)))(int);
+#define set_signal_for_restart(x,y) (0)
+#else
+#define set_signal(x,y)             (signal(x,y))
+#define set_signal_for_restart(x,y) (signal(x,y))
+#endif
+
 /* for setjmp/longjmp compatibility */
-#if defined(__CYGWIN__) || (defined(__x86_64) && !defined(__MINGW32__))
+#if defined(__CYGWIN__) || defined(HAVE_SIGACTION) || (defined(__x86_64) && !defined(__MINGW32__))
 #define JMP_BUF sigjmp_buf
 #define SETJMP(x) sigsetjmp(x,~0)
 #define LONGJMP(x,y) siglongjmp(x,y)
@@ -1000,6 +1017,7 @@ PL(NM(q))=1,BD(NM(q))[0]=(unsigned int)(n),DN(q)=0,(q)
 #define UNIMQ(q) ((q)&&NUM(q)&&SFF(q)&&(CONT((MQ)q)==1))
 #define MUNIQ(q) ((q)&&NUM(q)&&RATN(q)&&(SGN((Q)q)==-1)&&UNIN(NM((Q)q))&&(!DN((Q)q)))
 #define MUNIMQ(q) ((q)&&NUM(q)&&SFF(q)&&(CONT((MQ)q)==-1))
+#define UNILM(n) ((n)&&UNIN(BDY(n)))
 #define UNIN(n) ((n)&&(PL(n)==1)&&(BD(n)[0]==1))
 #define EVENN(n) ((!(n))||(!(BD(n)[0]%2)))
 
@@ -1813,7 +1831,7 @@ void pwrreal(Num,Num,Real *);
 void pwrmi(MQ,Q,MQ *);
 void pwrlm(LM,Q,LM *);
 void pwrum(int,UM,int,UM);
-void reallocarray(char **,int *,int *,int);
+void asir_reallocarray(char **,int *,int *,int);
 void reductr(VL,Obj,Obj *);
 void reimtocplx(Num,Num,Num *);
 void rem2q(Q,Q,Q,Q *);