===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/pvar.c,v
retrieving revision 1.18
retrieving revision 1.23
diff -u -p -r1.18 -r1.23
--- OpenXM_contrib2/asir2000/parse/pvar.c	2006/06/21 09:46:06	1.18
+++ OpenXM_contrib2/asir2000/parse/pvar.c	2017/02/07 08:30:31	1.23
@@ -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/pvar.c,v 1.17 2006/03/11 23:14:53 noro Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/pvar.c,v 1.22 2015/08/14 13:51:56 fujimoto Exp $ 
 */
 #include "ca.h"
 #include "parse.h"
@@ -68,6 +68,7 @@ void mkpvs(char *fname)
 			buf = ALLOCA(strlen("undeclared function "+strlen(fname)+10));
 			sprintf(buf,"undeclared function `%s'",fname);
 			yyerror(buf);
+			error("cannot continue to read inputs");
 		}
 	}
 	pvs = (VS)MALLOC(sizeof(struct oVS));
@@ -297,7 +298,7 @@ int getpvar(VS pvs,char *str,int searchonly)
 	if ( searchonly )
 		return -1;
 	if ( pvs->asize == pvs->n )
-		reallocarray((char **)&pvs->va,(int *)&pvs->asize,(int *)&pvs->n,(int)sizeof(struct oPV));
+		asir_reallocarray((char **)&pvs->va,(int *)&pvs->asize,(int *)&pvs->n,(int)sizeof(struct oPV));
 	v = &pvs->va[pvs->n]; 
 	NAME(v) = (char *)CALLOC(strlen(str)+1,sizeof(char));
 	strcpy(NAME(v),str); v->priv = 0;
@@ -305,7 +306,7 @@ int getpvar(VS pvs,char *str,int searchonly)
 	return i;
 }
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #define PCLOSE _pclose
 #else
 #define PCLOSE pclose
@@ -316,7 +317,7 @@ void closecurrentinput()
 	if ( asir_infile && !asir_infile->fp )
 		return;
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 	fclose(asir_infile->fp); 
 	unlink(asir_infile->tname);
 #else
@@ -360,6 +361,6 @@ void restorepvs()
 void storeans(pointer p)
 {
 	if ( APVS->asize == APVS->n )
-		reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV));
+		asir_reallocarray((char **)&APVS->va,(int *)&APVS->asize,(int *)&APVS->n,(int)sizeof(struct oPV));
 	APVS->va[APVS->n++].priv = p; 
 }