Re: [PATCH] fix failure of D07multibyte on Mac OS X

["Jun T." <takimoto-j@xxxxxxxxxxxxxxxxx>]

2015/05/09 00:42, Oliver Kiddle <okiddle@xxxxxxxxxxx> wrote:

> "../../Src/ztype.h", line 82: warning: macro redefined: ISPRINT

Renaming ISPRINT --> ZISPRINT.

Jun


diff --git a/Src/pattern.c b/Src/pattern.c
index 17cd40c..05dcb29 100644
--- a/Src/pattern.c
+++ b/Src/pattern.c
@@ -3622,7 +3622,7 @@ patmatchrange(char *range, int ch, int *indptr, int *mtp)
 		    return 1;
 		break;
 	    case PP_PRINT:
-		if (ISPRINT(ch))
+		if (ZISPRINT(ch))
 		    return 1;
 		break;
 	    case PP_PUNCT:
diff --git a/Src/utils.c b/Src/utils.c
index 3d12807..13d4b83 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -414,7 +414,7 @@ nicechar(int c)
     static char buf[6];
     char *s = buf;
     c &= 0xff;
-    if (ISPRINT(c))
+    if (ZISPRINT(c))
 	goto done;
     if (c & 0x80) {
 	if (isset(PRINTEIGHTBIT))
@@ -423,7 +423,7 @@ nicechar(int c)
 	*s++ = 'M';
 	*s++ = '-';
 	c &= 0x7f;
-	if(ISPRINT(c))
+	if(ZISPRINT(c))
 	    goto done;
     }
     if (c == 0x7f) {
diff --git a/Src/ztype.h b/Src/ztype.h
index d1bef0a..b73e3f8 100644
--- a/Src/ztype.h
+++ b/Src/ztype.h
@@ -77,7 +77,7 @@
 #endif
 
 #if defined(__APPLE__) && defined(BROKEN_ISPRINT)
-#define ISPRINT(c)  isprint_ascii(c)
+#define ZISPRINT(c)  isprint_ascii(c)
 #else
-#define ISPRINT(c)  isprint(c)
+#define ZISPRINT(c)  isprint(c)
 #endif