===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/util.c,v
retrieving revision 1.14
retrieving revision 1.18
diff -u -p -r1.14 -r1.18
--- OpenXM_contrib2/asir2000/parse/util.c	2005/09/14 02:48:38	1.14
+++ OpenXM_contrib2/asir2000/parse/util.c	2015/08/14 13:51:56	1.18
@@ -45,12 +45,12 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2000/parse/util.c,v 1.13 2005/02/08 18:06:05 saito Exp $ 
+ * $OpenXM: OpenXM_contrib2/asir2000/parse/util.c,v 1.17 2015/08/06 10:01:53 fujimoto Exp $ 
 */
 #include "ca.h"
 #include "base.h"
 #include "parse.h"
-#if defined(__GNUC__) || defined(VISUAL) || (defined(__MACH__) && defined(__ppc__)) || defined(__FreeBSD__)
+#if defined(__GNUC__) || defined(VISUAL) || defined(__MINGW32__) || (defined(__MACH__) && defined(__ppc__)) || defined(__FreeBSD__)
 #include <stdarg.h>
 #else
 #include <varargs.h>
@@ -78,9 +78,10 @@ void stoarg(char *s,int *acp,char **av)
 	int i;
 
 	for ( i = 0; ; i++ ) {
-		for ( ; *s && isspace(*s); s++ );
+		for ( ; *s && isspace((unsigned char)*s); s++ );
 		if ( *s ) {
-			for ( av[i] = s; *s && !isspace(*s); s++ );
+			for ( av[i] = s; *s && 
+				!isspace((unsigned char)*s); s++ );
 			if ( *s )
 				*s++ = 0;
 		} else {
@@ -290,7 +291,7 @@ int zp(P p)
 	return ( r );
 }
 
-#if defined(__GNUC__) || defined(VISUAL) || (defined(__MACH__) && defined(__ppc__)) || defined(__FreeBSD__)
+#if defined(__GNUC__) || defined(VISUAL) || defined(__MINGW32__) || (defined(__MACH__) && defined(__ppc__)) || defined(__FreeBSD__)
 NODE mknode(int ac,...)
 {
 	va_list ap;
@@ -392,7 +393,7 @@ V searchvar(char *str)
 {
 	VL vl;
 
-	for ( vl = CO; ;vl = NEXT(vl) ) 
+	for ( vl = CO; vl ;vl = NEXT(vl) ) 
 		if ( NAME(VR(vl)) && !strcmp(NAME(VR(vl)),str) )
 			return VR(vl);
 	return 0;