===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/ca.h,v
retrieving revision 1.80
retrieving revision 1.84
diff -u -p -r1.80 -r1.84
--- OpenXM_contrib2/asir2000/include/ca.h	2011/05/11 06:03:53	1.80
+++ OpenXM_contrib2/asir2000/include/ca.h	2013/07/31 00:38:12	1.84
@@ -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.79 2009/06/01 07:31:54 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/include/ca.h,v 1.83 2013/06/13 18:03:14 ohara Exp $ 
 */
 #include <stdio.h>
 #include <stdlib.h>
@@ -69,6 +69,7 @@
 #endif
 
 #if defined(VISUAL)
+#include <limits.h>
 #include <malloc.h>
 #endif
 
@@ -90,6 +91,8 @@ typedef void * pointer;
 #endif
 #endif
 
+#define NULLP ((void *)0)
+
 #define TODO		printf("%s: not implemented!\n", __func__)
 
 #define COPY(a,b) ((b)=(a))
@@ -724,15 +727,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))
@@ -1428,6 +1427,8 @@ 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);