===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/include/ca.h,v
retrieving revision 1.14
retrieving revision 1.20
diff -u -p -r1.14 -r1.20
--- OpenXM_contrib2/asir2018/include/ca.h	2019/11/19 10:50:31	1.14
+++ OpenXM_contrib2/asir2018/include/ca.h	2021/01/25 00:39:52	1.20
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2018/include/ca.h,v 1.13 2019/11/12 22:27:04 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2018/include/ca.h,v 1.19 2020/10/06 06:31:19 noro Exp $
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -95,8 +95,13 @@ typedef caddr_t pointer;
 
 typedef void * pointer;
 
-#if defined(sun)
+#if defined(ANDROID)
 #include <strings.h>
+#include <string.h>
+#define index(s,c) strchr(s,c)
+#define rindex(s,c) strrchr(s,c)
+#elif defined(sun)
+#include <strings.h>
 #else
 #include <string.h>
 #if defined(VISUAL) || defined(__MINGW32__)
@@ -445,6 +450,7 @@ typedef struct oQUOTE {
   short id;
   short pad;
   pointer body;
+  struct oVS *pvs;
 } *QUOTE;
 
 typedef struct oQUOTEARG {
@@ -695,8 +701,10 @@ struct order_spec {
   int *top_weight;
   int module_rank;
   int *module_top_weight;
+  int *module_base_ord;
   struct order_spec *base; /* for schreyer order */
   DMMstack dmmstack;
+  int (*cmpdl)(int n,DL d1,DL d2);
   union {
     int simple;
     struct {
@@ -824,7 +832,11 @@ void (*set_signal(int sig, void (*handler)(int)))(int)
 #endif
 
 /* for setjmp/longjmp compatibility */
-#if defined(__CYGWIN__) || defined(HAVE_SIGACTION) || (defined(__x86_64) && !defined(__MINGW32__))
+#if defined(ANDROID)
+#define JMP_BUF jmp_buf
+#define SETJMP(x) _setjmp(x)
+#define LONGJMP(x,y) _longjmp(x,y)
+#elif 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)
@@ -978,7 +990,7 @@ DEG(DC(p))=ONE,COEF(DC(p))=(P)ONEM,NEXT(DC(p))=0)
 #define MKMATHCAP(e,b) (NEWMATHCAP(e),(e)->body=(LIST)(b))
 #define MKBYTEARRAY(m,l) \
 (NEWBYTEARRAY(m),(m)->len=(l),(m)->body=(unsigned char *)MALLOC_ATOMIC((l)),bzero((m)->body,(l)))
-#define MKQUOTE(q,b) (NEWQUOTE(q),(q)->body=(pointer)(b))
+#define MKQUOTE(q,b) (NEWQUOTE(q),(q)->body=(pointer)(b),(q)->pvs=CPVS)
 #define MKQUOTEARG(q,t,b) (NEWQUOTEARG(q),(q)->type=(t),(q)->body=(pointer)(b))
 
 #define NEXTDC(r,c) \
@@ -1455,11 +1467,11 @@ int divcheck(VL,P *,int,P,P);
 int divtdcpz(VL,P,P,P *);
 int divtpz(VL,P,P,P *);
 int divum(register int,UM,UM,UM);
-int dm(int,int,int *);
-int dmb(int,int,int,int *);
-int dma(int,int,int,int *);
-int dmab(int,int,int,int,int *);
-int dmar(int,int,int,int);
+unsigned int dm(unsigned int,unsigned int,unsigned int *);
+unsigned int dmb(unsigned int,unsigned int,unsigned int,unsigned int *);
+unsigned int dma(unsigned int,unsigned int,unsigned int,unsigned int *);
+unsigned int dmab(unsigned int,unsigned int,unsigned int,unsigned int,unsigned int *);
+unsigned int dmar(unsigned int,unsigned int,unsigned int,unsigned int);
 int dtestmain(P,Q,ML,int,int *,P *,P *);
 int geldb(VL,P);
 int getchomdeg(V,P);