mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-12 01:11:27 +02:00
Code Releases Activity

35064: rename ISPRINT to ZISPRINT to avoid conflict

Browse source
This commit is contained in:
Jun-ichi Takimoto 2015-05-09 16:02:37 +09:00
parent f855801fb9
commit a6db0b41ca
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2015-05-08 Peter Stephenson <p.stephenson@samsung.com>
* 35059: Doc/Zsh/builtins.yo, Src/params.c, * 35059: Doc/Zsh/builtins.yo, Src/params.c,

2
Src/pattern.c
View file

@ -3622,7 +3622,7 @@ patmatchrange(char *range, int ch, int *indptr, int *mtp)
return 1; return 1;
break; break;
case PP_PRINT: case PP_PRINT:
if (ISPRINT(ch)) if (ZISPRINT(ch))
return 1; return 1;
break; break;
case PP_PUNCT: case PP_PUNCT:

4
Src/utils.c
View file

@ -414,7 +414,7 @@ nicechar(int c)
static char buf[6]; static char buf[6];
char *s = buf; char *s = buf;
c &= 0xff; c &= 0xff;
if (ISPRINT(c)) if (ZISPRINT(c))
goto done; goto done;
if (c & 0x80) { if (c & 0x80) {
if (isset(PRINTEIGHTBIT)) if (isset(PRINTEIGHTBIT))
@ -423,7 +423,7 @@ nicechar(int c)
*s++ = 'M'; *s++ = 'M';
*s++ = '-'; *s++ = '-';
c &= 0x7f; c &= 0x7f;
if(ISPRINT(c)) if(ZISPRINT(c))
goto done; goto done;
} }
if (c == 0x7f) { if (c == 0x7f) {

4
Src/ztype.h
View file

@ -77,7 +77,7 @@
#endif #endif
#if defined(__APPLE__) && defined(BROKEN_ISPRINT) #if defined(__APPLE__) && defined(BROKEN_ISPRINT)
#define ISPRINT(c) isprint_ascii(c) #define ZISPRINT(c) isprint_ascii(c)
#else #else
#define ISPRINT(c) isprint(c) #define ZISPRINT(c) isprint(c)
#endif #endif