===================================================================
RCS file: /home/cvs/OpenXM/src/ox_toolkit/ox.c,v
retrieving revision 1.33
retrieving revision 1.36
diff -u -p -r1.33 -r1.36
--- OpenXM/src/ox_toolkit/ox.c	2005/03/03 07:25:17	1.33
+++ OpenXM/src/ox_toolkit/ox.c	2013/10/20 15:29:12	1.36
@@ -1,5 +1,5 @@
 /* -*- mode: C; coding: euc-japan -*- */
-/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.32 2005/03/03 06:38:15 ohara Exp $ */
+/* $OpenXM: OpenXM/src/ox_toolkit/ox.c,v 1.35 2013/10/20 14:58:20 iwane Exp $ */
 
 /* 
    This module includes functions for sending/receiveng CMO's.
@@ -210,10 +210,12 @@ static cmo_zz* receive_cmo_zz(OXFILE *oxfp)
 
 static cmo_qq* receive_cmo_qq(OXFILE *oxfp)
 {
-    cmo_qq* c = new_cmo_qq_noinit();
-    c->num = receive_cmo(oxfp);
-    c->den = receive_cmo(oxfp);
-    return c;
+    mpz_t num, den;
+    mpz_init(num);
+    mpz_init(den);
+    receive_mpz(oxfp, num);
+    receive_mpz(oxfp, den);
+    return new_cmo_qq_set_mpz(num, den);
 }
 
 static cmo_zero* receive_cmo_zero(OXFILE *oxfp)
@@ -385,12 +387,19 @@ cmo *receive_cmo_tag(OXFILE *oxfp, int tag)
 static void receive_mpz(OXFILE *oxfp, mpz_ptr mpz)
 {
     int i;
+    int n = sizeof(mpz->_mp_d[0]) / sizeof(int);
     int size  = receive_int32(oxfp);
     int len   = abs(size);
-    resize_mpz(mpz, size);
+    int *ptr;
+    if (n == 1) {
+        resize_mpz(mpz, size);
+    } else {
+        resize_mpz(mpz, (size+1) / n);
+    }
 
+    ptr = (int *)mpz->_mp_d;
     for(i=0; i<len; i++) {
-        mpz->_mp_d[i] = receive_int32(oxfp);
+        ptr[i] = receive_int32(oxfp);
     }
 }
 
@@ -605,8 +614,8 @@ static int send_cmo_zz(OXFILE *oxfp, cmo_zz* c)
 
 static int send_cmo_qq(OXFILE *oxfp, cmo_qq* c)
 {
-    send_cmo(oxfp, c->num);
-    send_cmo(oxfp, c->den);
+    send_mpz(oxfp, mpq_numref(c->mpq));
+    send_mpz(oxfp, mpq_denref(c->mpq));
     return 0;
 }
 
@@ -703,10 +712,12 @@ void send_cmo(OXFILE *oxfp, cmo* c)
 static int send_mpz(OXFILE *oxfp, mpz_ptr mpz)
 {
     int i;
-    int len = abs(mpz->_mp_size);
-    send_int32(oxfp, mpz->_mp_size);
+	int n = sizeof(mpz->_mp_d[0]) / sizeof(int);
+    int len = abs(mpz->_mp_size) * n;
+	int *ptr = (int *)mpz->_mp_d;
+    send_int32(oxfp, mpz->_mp_size * n);
     for(i=0; i<len; i++) {
-        send_int32(oxfp, mpz->_mp_d[i]);
+        send_int32(oxfp, ptr[i]);
     }
     return 0;
 }