=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/builtin/gr.c,v retrieving revision 1.67 retrieving revision 1.72 diff -u -p -r1.67 -r1.72 --- OpenXM_contrib2/asir2000/builtin/gr.c 2011/06/16 08:17:14 1.67 +++ OpenXM_contrib2/asir2000/builtin/gr.c 2016/08/08 07:18:10 1.72 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.66 2010/01/31 03:25:54 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.71 2015/08/14 13:51:54 fujimoto Exp $ */ #include "ca.h" #include "parse.h" @@ -53,8 +53,8 @@ #include "ox.h" #if defined(__GNUC__) -#define INLINE inline -#elif defined(VISUAL) +#define INLINE static inline +#elif defined(VISUAL) || defined(__MINGW32__) #define INLINE __inline #else #define INLINE @@ -98,6 +98,7 @@ int GenTrace = 0; int GenSyz = 0; int OXCheck = -1; int OneZeroHomo = 0; +int MaxDeg = 0; int NoSugar = 0; static int NoCriB = 0; @@ -911,8 +912,8 @@ NODE gb_f4_mod(NODE f,int m) /* XXX free redmat explicitly */ for ( k = 0; k < nred; k++ ) { - GC_free(BDY(redmat[k])); - GC_free(redmat[k]); + GCFREE(BDY(redmat[k])); + GCFREE(redmat[k]); } get_eg(&tmp0); add_eg(&eg_elim1,&tmp1,&tmp0); @@ -975,7 +976,7 @@ NODE gb_f4_mod(NODE f,int m) /* XXX free spmat[] explicitly */ for ( j = 0; j < nsp; j++ ) { - GC_free(spmat[j]); + GCFREE(spmat[j]); } } if ( DP_Print ) { @@ -2326,6 +2327,8 @@ void dp_set_flag(Obj name,Obj value) GenSyz = v; else if ( !strcmp(n,"OneZeroHomo") ) OneZeroHomo = v; + else if ( !strcmp(n,"MaxDeg") ) + MaxDeg = v; } void dp_make_flaglist(LIST *list) @@ -2353,6 +2356,8 @@ void dp_make_flaglist(LIST *list) STOQ(OXCheck,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"OXCheck"); MKNODE(n1,name,n); n = n1; STOQ(GenTrace,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"GenTrace"); MKNODE(n1,name,n); n = n1; STOQ(GenSyz,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"GenSyz"); MKNODE(n1,name,n); n = n1; + STOQ(MaxDeg,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"MaxDeg"); MKNODE(n1,name,n); n = n1; + STOQ(OneZeroHomo,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"OneZeroHomo"); MKNODE(n1,name,n); n = n1; STOQ(PtozpRA,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"PtozpRA"); MKNODE(n1,name,n); n = n1; STOQ(ShowMag,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"ShowMag"); MKNODE(n1,name,n); n = n1; STOQ(Top,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Top"); MKNODE(n1,name,n); n = n1;