=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/glob.c,v retrieving revision 1.92 retrieving revision 1.95 diff -u -p -r1.92 -r1.95 --- OpenXM_contrib2/asir2000/parse/glob.c 2016/08/24 05:33:58 1.92 +++ OpenXM_contrib2/asir2000/parse/glob.c 2017/02/07 08:30:31 1.95 @@ -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/parse/glob.c,v 1.91 2015/08/19 05:29:23 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/parse/glob.c,v 1.94 2016/08/26 04:51:34 ohara Exp $ */ #include "ca.h" #include "al.h" @@ -162,9 +162,9 @@ void glob_init() { VR(&oVLIST[i]) = &oVAR[i]; NEXT(&oVLIST[i]) = &oVLIST[i+1]; } VR(&oVLIST[i]) = &oVAR[i]; NEXT(&oVLIST[i]) = 0; - reallocarray((char **)&GPVS->va,(int *)&GPVS->asize,(int *)&GPVS->n,(int)sizeof(struct oPV)); - reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV)); - reallocarray((char **)&PPVS->va,(int *)&PPVS->asize,(int *)&PPVS->n,(int)sizeof(struct oPV)); + asir_reallocarray((char **)&GPVS->va,(int *)&GPVS->asize,(int *)&GPVS->n,(int)sizeof(struct oPV)); + asir_reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV)); + asir_reallocarray((char **)&PPVS->va,(int *)&PPVS->asize,(int *)&PPVS->n,(int)sizeof(struct oPV)); CPVS = GPVS; MKNODE(ONENODE,mkfnode(1,I_FORMULA,ONE),NULLP); OID(F_TRUE)=O_F; FOP(F_TRUE)=AL_TRUE; F_TRUE->arg.dummy = 0; @@ -884,13 +884,14 @@ char *scopyright() } #if defined(VISUAL) || defined(__MINGW32__) +int recv_intr; void check_intr() { extern int recv_intr; if ( recv_intr ) { if ( recv_intr == 1 ) { recv_intr = 0; - int_handler(0); + int_handler(SIGINT); } else { recv_intr = 0; ox_usr1_handler(0);