about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Src/pattern.c2
-rw-r--r--Src/utils.c4
-rw-r--r--Src/ztype.h4
4 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 4dbb36abd..887637967 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-09  Jun-ichi Takimoto <takimoto-j@kba.biglobe.ne.jp>
+
+	* 35064: Src/pattern.c, Src/utils.c, Src/ztype.h: rename
+	ISPRINT to ZISPRINT to avoid name conflict
+
 2015-05-08  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* 35059: Doc/Zsh/builtins.yo, Src/params.c,
diff --git a/Src/pattern.c b/Src/pattern.c
index 17cd40c23..05dcb2943 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 3d12807e2..13d4b83d4 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 d1bef0a5a..b73e3f840 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