===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.70
retrieving revision 1.83
diff -u -p -r1.70 -r1.83
--- OpenXM_contrib2/asir2000/include/ca.h	2008/08/11 16:23:24	1.70
+++ OpenXM_contrib2/asir2000/include/ca.h	2013/06/13 18:03:14	1.83
@@ -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.82 2012/12/17 07:20:45 noro Exp $ 
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -57,9 +57,6 @@
 
 #if !defined(VISUAL)
 #include <unistd.h>
-#endif
-
-#if !defined(VISUAL)
 #include <sys/param.h>
 #endif
 
@@ -93,6 +90,8 @@ typedef void * pointer;
 #endif
 #endif
 
+#define NULLP ((void *)0)
+
 #define TODO		printf("%s: not implemented!\n", __func__)
 
 #define COPY(a,b) ((b)=(a))
@@ -153,18 +152,16 @@ 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 defined(VISUAL)
-typedef _int64 L;
-typedef unsigned _int64 UL;
-#else
+#if SIZEOF_LONG == 8
+typedef long L;
+typedef unsigned long UL;
+#elif defined(HAVE_UNSIGNED_LONG_LONG)
 typedef long long L;
 typedef unsigned long long UL;
+#elif defined(_MSC_VER)
+typedef _int64 L;
+typedef unsigned _int64 UL;
 #endif
-#else
-typedef long L;
-typedef unsigned long UL;
-#endif
 
 typedef struct oN {
 	int p;
@@ -625,6 +622,8 @@ struct order_spec {
 	int id;
 	Obj obj;
 	int nv;
+	int ispot; /* 1 means Position over Term (Pos then Term) */
+	int pot_nelim; /* size of positions for pot-elimination order */
 	union {
 		int simple;
 		struct {
@@ -727,15 +726,11 @@ typedef unsigned int ModNum;
 
 /* memory allocators (W_... : uses alloca) */
 
-#if 0
 #define MALLOC(d) Risa_GC_malloc(d)
 #define MALLOC_ATOMIC(d) Risa_GC_malloc_atomic(d)
+#define MALLOC_ATOMIC_IGNORE_OFF_PAGE(d) Risa_GC_malloc_atomic_ignore_off_page(d)
 #define REALLOC(p,d) Risa_GC_realloc(p,d)
-#else
-#define MALLOC(d) GC_malloc(d)
-#define MALLOC_ATOMIC(d) GC_malloc_atomic(d)
-#define REALLOC(p,d) GC_realloc(p,d)
-#endif
+#define GCFREE(p) Risa_GC_free(p)
 #define CALLOC(d,e) MALLOC((d)*(e))
 
 #if !defined(__CYGWIN__) && (defined(__GNUC__) || defined(vax) || defined(apollo) || defined(alloca) || defined(VISUAL))
@@ -1321,7 +1316,7 @@ void copyn(N,int,int *);
 void kmulnmain(N,N,N *);
 int qcoefp(Obj);
 int qcoefr(Obj);
-long get_allocwords(void);
+size_t get_allocwords(void);
 double get_clock(void);
 void get_eg(struct oEGT *);
 void printtime(struct oEGT *,struct oEGT *,double);
@@ -1426,9 +1421,13 @@ 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);
+void Risa_GC_free(void *);
+void *Risa_GC_malloc_atomic_ignore_off_page(size_t);
 void *GC_malloc(size_t);
 void *GC_malloc_atomic(size_t);
 void *GC_realloc(void *,size_t);