===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/gc_risa.c,v
retrieving revision 1.5
retrieving revision 1.9
diff -u -p -r1.5 -r1.9
--- OpenXM_contrib2/asir2000/parse/gc_risa.c	2009/02/05 11:21:38	1.5
+++ OpenXM_contrib2/asir2000/parse/gc_risa.c	2009/02/16 17:23:52	1.9
@@ -1,3 +1,8 @@
+/* $OpenXM: OpenXM_contrib2/asir2000/parse/gc_risa.c,v 1.8 2009/02/06 10:11:12 ohara Exp $ */
+
+#if defined(VISUAL)
+#include "private/gcconfig.h"
+#endif
 #include "gc.h"
 #include <time.h>
 
@@ -50,8 +55,7 @@ long get_allocwords()
 	return (long)BYTES_TO_WORDS(n); /* bytes to words */
 }
 
-double gctime;
-static double gcstart,asir_start_time;
+static double asir_start_time;
 
 double get_clock(), get_rtime(), get_current_time();
 
@@ -72,8 +76,6 @@ double get_rtime()
 	return get_current_time() - asir_start_time;
 }
 
-#if defined(THINK_C) || defined(__MWERKS__) || defined(VISUAL) || defined(MSWIN32)
-
 #if defined(VISUAL)
 #include <windows.h>
 
@@ -129,7 +131,7 @@ double get_clock()
 	} else
 		return get_current_time();
 }
-#else
+#elif defined(THINK_C) || defined(__MWERKS__) || defined(MSWIN32)
 double get_current_time()
 {
 	return get_clock();
@@ -142,8 +144,6 @@ double get_clock()
 	c = clock();
 	return (double)c/(double)CLOCKS_PER_SEC;
 }
-#endif
-
 #else
 #include <sys/time.h>
 
@@ -170,7 +170,6 @@ double get_clock()
 }
 #else
 
-#include <sys/time.h>
 #include <sys/resource.h>
 
 double get_clock()
@@ -186,6 +185,7 @@ double get_clock()
 #endif
 #endif
 
+#if !defined(NO_ASIR_GC)
 extern int GC_free_space_numerator;
 
 void Risa_GC_get_adj(int *nm, int *dn) {
@@ -197,14 +197,20 @@ void Risa_GC_set_adj(int nm, int dn) {
 	GC_free_space_numerator = nm;
 	GC_free_space_divisor = dn;
 }
+#else
+void Risa_GC_get_adj(int *nm, int *dn) {
+	*nm = 1;
+	*dn = GC_free_space_divisor;
+}
 
-void GC_timerstart() {
-	gcstart = get_clock();
+void Risa_GC_set_adj(int nm, int dn) {
+	GC_free_space_divisor = dn/nm;
 }
 
-void GC_timerstop() {
-	gctime += get_clock() - gcstart;
+double GC_get_gctime() {
+	return 0.0;
 }
+#endif
 
 #if defined(MSWIN32) && !defined(VISUAL)
 #include <signal.h>