=================================================================== RCS file: /home/cvs/OpenXM/src/ox_toolkit/dump.c,v retrieving revision 1.2 retrieving revision 1.8 diff -u -p -r1.2 -r1.8 --- OpenXM/src/ox_toolkit/dump.c 2003/03/23 20:17:35 1.2 +++ OpenXM/src/ox_toolkit/dump.c 2016/06/30 01:14:00 1.8 @@ -1,15 +1,18 @@ /* -*- mode: C; coding: euc-japan -*- */ -/* $OpenXM: OpenXM/src/ox_toolkit/dump.c,v 1.1 2000/10/10 05:23:20 ohara Exp $ */ +/* $OpenXM: OpenXM/src/ox_toolkit/dump.c,v 1.7 2015/08/27 03:03:33 ohara Exp $ */ /* This module includes functions for sending/receiveng CMO's. - Some commnets is written in Japanese by the EUC-JP coded - character set. */ #include #include +#include +#if !defined(_MSC_VER) #include +#else +#include +#endif #include "ox_toolkit.h" static void dump_cmo_int32(cmo_int32* m); @@ -18,10 +21,8 @@ static void dump_cmo_mathcap(cmo_mathcap* m); static void dump_cmo_null(cmo_null* m); static void dump_cmo_string(cmo_string* m); static void dump_cmo_monomial32(cmo_monomial32* c); -#if defined(WITH_GMP) static void dump_cmo_zz(cmo_zz* c); static void dump_mpz(mpz_ptr mpz); -#endif /* WITH_GMP */ static void dump_string(void *s, int len); static void dump_integer(int x); @@ -48,7 +49,6 @@ static void dump_integer(int x) dump_string(&x, sizeof(int)); } -#if defined(WITH_GMP) static void dump_mpz(mpz_ptr mpz) { int i; @@ -58,7 +58,6 @@ static void dump_mpz(mpz_ptr mpz) dump_integer(mpz->_mp_d[i]); } } -#endif /* WITH_GMP */ __inline__ static void dump_cmo_null(cmo_null* m) @@ -105,19 +104,17 @@ static void dump_cmo_monomial32(cmo_monomial32* c) dump_cmo(c->coef); } -#if defined(WITH_GMP) static void dump_cmo_zz(cmo_zz* c) { dump_mpz(c->mpz); } -#endif /* WITH_GMP */ static void dump_cmo_distributed_polynomial(cmo_distributed_polynomial* m) { cell* cp; - dump_integer(list_length(m)); + dump_integer(list_length((cmo_list *)m)); dump_cmo(m->ringdef); - for(cp = list_first(m); !list_endof(m, cp); cp = list_next(cp)) { + for(cp = list_first((cmo_list *)m); !list_endof((cmo_list *)m, cp); cp = list_next(cp)) { dump_cmo(cp->cmo); } } @@ -150,15 +147,14 @@ void dump_cmo(cmo* m) case CMO_MONOMIAL32: dump_cmo_monomial32((cmo_monomial32 *)m); break; -#if defined(WITH_GMP) case CMO_ZZ: dump_cmo_zz((cmo_zz *)m); break; -#endif /* WITH_GMP */ case CMO_DISTRIBUTED_POLYNOMIAL: dump_cmo_distributed_polynomial((cmo_distributed_polynomial *)m); break; default: + ; } }