===================================================================
RCS file: /home/cvs/OpenXM/src/kan96xx/plugin/cmo-gmp.c,v
retrieving revision 1.8
retrieving revision 1.11
diff -u -p -r1.8 -r1.11
--- OpenXM/src/kan96xx/plugin/cmo-gmp.c	2003/09/02 03:24:50	1.8
+++ OpenXM/src/kan96xx/plugin/cmo-gmp.c	2020/10/06 11:33:47	1.11
@@ -1,8 +1,10 @@
-/*$OpenXM: OpenXM/src/kan96xx/plugin/cmo-gmp.c,v 1.7 2003/08/26 05:04:41 takayama Exp $ */
+/*$OpenXM: OpenXM/src/kan96xx/plugin/cmo-gmp.c,v 1.10 2015/09/14 07:56:20 takayama Exp $ */
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
 /* #include <netinet/in.h> */
 #include <limits.h>
+#include <arpa/inet.h>
 #include "datatype.h"
 #include "stackm.h"
 #include "extern.h"
@@ -17,18 +19,25 @@
 #include "file2.h"
 #include "cmo.h"
 
+/* for gmp6.0.0 */
+#ifndef BYTES_PER_MP_LIMB
+#define BYTES_PER_MP_LIMB SIZEOF_MP_LIMB_T
+#endif
+
 extern int OxVersion;
 size_t cmoOutGMPCoeff_old(mpz_srcptr x);
 size_t cmoOutGMPCoeff_new(mpz_srcptr x);
-size_t
-cmoOutGMPCoeff(mpz_srcptr x) {
+size_t cmoGetGMPCoeff_old(MP_INT *x, struct cmoBuffer *cb);
+size_t cmoGetGMPCoeff_new(MP_INT *x, struct cmoBuffer *cb);
+
+size_t cmoOutGMPCoeff(mpz_srcptr x) {
   if (OxVersion >= 199907170)
     return(cmoOutGMPCoeff_new(x));
   else
     return(cmoOutGMPCoeff_old(x));
 }
 
-cmoGetGMPCoeff(MP_INT *x, struct cmoBuffer *cb) {
+size_t cmoGetGMPCoeff(MP_INT *x, struct cmoBuffer *cb) {
   if (OxVersion >= 199907170)
     return(cmoGetGMPCoeff_new(x,cb));
   else
@@ -65,18 +74,18 @@ static int myfputc(int i) {
   tmp[0] = i;
   cmoOutputToBuf(CMOPUT,tmp,1);
 }
-static outRawInt32(int k)
+static void outRawInt32(int k)
 {
   int tmp[1];
   tmp[0] = htonl((int) k);
   cmoOutputToBuf(CMOPUT,tmp,4);
 }
 
-size_t
-cmoOutGMPCoeff_old(mpz_srcptr x)
+size_t cmoOutGMPCoeff_old(mpz_srcptr x)
 {
   fprintf(stderr,"cmoOutGMPCoeff_old is no longer supported.\n");
   exit(10);
+  return 0;
 }
 
 
@@ -142,18 +151,18 @@ static int getRawInt32(struct cmoBuffer *cb)
 }
 #endif
 
-cmoGetGMPCoeff_old(MP_INT *x, struct cmoBuffer *cb)
+size_t cmoGetGMPCoeff_old(MP_INT *x, struct cmoBuffer *cb)
 {
   fprintf(stderr,"cmoGetGMPCoeff_old is no longer supported.\n");
   exit(10);
+  return 0;
 }
 
 /*****************************************************/
 /*****   new version for CMO_ZZ  *********************/
 /*****************************************************/
 #if BYTES_PER_MP_LIMB == 8
-size_t
-cmoOutGMPCoeff_new(mpz_srcptr x)
+size_t cmoOutGMPCoeff_new(mpz_srcptr x)
 {
   int i;
   mp_size_t s;
@@ -203,7 +212,7 @@ cmoOutGMPCoeff_new(mpz_srcptr x)
   return ( ABS (xsize) );
 }
 
-cmoGetGMPCoeff_new(MP_INT *x, struct cmoBuffer *cb)
+size_t cmoGetGMPCoeff_new(MP_INT *x, struct cmoBuffer *cb)
 {
   int i;
   mp_size_t s;
@@ -253,8 +262,7 @@ cmoGetGMPCoeff_new(MP_INT *x, struct cmoBuffer *cb)
   return( xsize0 ); 
 }
 #elif BYTES_PER_MP_LIMB == 4
-size_t
-cmoOutGMPCoeff_new(mpz_srcptr x)
+size_t cmoOutGMPCoeff_new(mpz_srcptr x)
 {
   int i;
   mp_size_t s;
@@ -301,7 +309,7 @@ cmoOutGMPCoeff_new(mpz_srcptr x)
   return ( ABS (xsize) );
 }
 
-cmoGetGMPCoeff_new(MP_INT *x, struct cmoBuffer *cb)
+size_t cmoGetGMPCoeff_new(MP_INT *x, struct cmoBuffer *cb)
 {
   int i;
   mp_size_t s;