=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/include/b.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- OpenXM_contrib2/asir2000/include/b.h 2005/07/03 10:19:23 1.4 +++ OpenXM_contrib2/asir2000/include/b.h 2005/07/11 10:14:09 1.5 @@ -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/include/b.h,v 1.3 2000/08/22 05:04:14 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/include/b.h,v 1.4 2005/07/03 10:19:23 ohara Exp $ */ #ifdef FBASE #define D_ADDP(x,y,z,u) addp(x,y,z,u) @@ -82,10 +82,10 @@ #define PWRNUM(x,y,z) (*pwrnumt[NID((Q)x)])(x,y,z) #define CHSGNNUM(x,y) { \ if (NID((Q)x)==N_Q) { \ - Q t; DUPQ((Q)(x),t); SGN((Q)t)= -SGN(t); (y)= t; } \ + Q t__; DUPQ((Q)(x),t__); SGN((Q)t__)= -SGN(t__); (y)= t__; } \ else if (NID((Q)x)==N_R) { \ - Real t; NEWReal(t); BDY(t)= -BDY((Real)x); (y) = t; } \ - else {P t; (*chsgnnumt[NID((Q)x)])(x,&t); (y) = t; } } + Real t__; NEWReal(t__); BDY(t__)= -BDY((Real)x); (y) = t__; } \ + else {P t__; (*chsgnnumt[NID((Q)x)])(x,&t__); (y) = t__; } } #define ADDQ(x,y,z) addq(x,y,z) #define SUBQ(x,y,z) subq(x,y,z) #define MULQ(x,y,z) mulq(x,y,z) @@ -136,7 +136,7 @@ #define MULNUM(x,y,z) mulmq(mod,(MQ)x,(MQ)y,(MQ *)z) #define DIVNUM(x,y,z) divmq(mod,(MQ)x,(MQ)y,(MQ *)z) #define PWRNUM(x,y,z) pwrmq(mod,(MQ)x,y,(MQ *)z) -#define CHSGNNUM(x,y) {MQ t; NEWMQ(t),CONT(t)=mod-CONT((MQ)(x)); (y)=t; } +#define CHSGNNUM(x,y) {MQ t__; NEWMQ(t__),CONT(t__)=mod-CONT((MQ)(x)); (y)=t__; } #define ADDQ(x,y,z) addmq(mod,x,y,z) #define SUBQ(x,y,z) submq(mod,x,y,z) #define MULQ(x,y,z) mulmq(mod,x,y,z)