===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/mathcap.c,v
retrieving revision 1.7
retrieving revision 1.11
diff -u -p -r1.7 -r1.11
--- OpenXM/src/ox_toolkit/mathcap.c	2000/12/03 16:15:03	1.7
+++ OpenXM/src/ox_toolkit/mathcap.c	2005/03/04 06:29:46	1.11
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/mathcap.c,v 1.6 2000/11/27 09:57:10 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/mathcap.c,v 1.10 2003/09/15 09:31:41 ohara Exp $ */
 
 /* This module includes functions for handling mathcap databases. */
 
@@ -39,6 +39,8 @@ static int cmotbl_a[] = {
     CMO_LIST,
     CMO_MONOMIAL32,
     CMO_ZZ,
+    CMO_QQ,
+    CMO_IEEE_DOUBLE_FLOAT,
     CMO_ZERO,
     CMO_DMS_GENERIC,
     CMO_RING_BY_NAME,
@@ -87,7 +89,7 @@ static table *new_table(int *src)
     int i;
     while (src[len++] != 0) {
     }
-    new = malloc(sizeof(table)*len);
+    new = MALLOC(sizeof(table)*len);
     for(i=0; i<len; i++) {
         table_init(new+i, src[i]);
     }
@@ -236,7 +238,7 @@ static cmo_list *sysinfo_get()
 
 static char *new_string(char *s)
 {
-    char *t = malloc(sizeof(s)+1);
+    char *t = MALLOC(strlen(s)+1);
     strcpy(t, s);
     return t;
 }
@@ -247,7 +249,7 @@ static int *new_int_array(int *array)
     int length = 0;
     while(array[length++] != 0)
         ;
-    new_array = malloc(sizeof(int)*length);
+    new_array = MALLOC(sizeof(int)*length);
     return memcpy(new_array, array, sizeof(int)*length);
 }
 
@@ -268,7 +270,7 @@ void mathcap_init(int ver, char *vstr, char *sysname, 
 
 mathcap *new_mathcap()
 {
-    mathcap *new = malloc(sizeof(mathcap));
+    mathcap *new = MALLOC(sizeof(mathcap));
     new->cmotbl = new_table(sysinfo.cmo_tags);
     new->smtbl  = new_table(sysinfo.sm_cmds);
     return new;
@@ -279,7 +281,7 @@ cmo_mathcap* mathcap_get(mathcap *this)
 {
     cmo_list *mc = new_cmo_list();
     cmo_list *l3 = new_cmo_list();
-    list_append(l3, list_appendl(new_cmo_list(),
+    list_append(l3, (cmo *)list_appendl(new_cmo_list(),
                                  new_cmo_int32(OX_DATA),
                                  table_get_all(this->cmotbl), NULL));
     list_appendl(mc, (cmo *)sysinfo_get(),