diff options
author | Peter Stephenson <pws@users.sourceforge.net> | 2003-03-24 12:56:56 +0000 |
---|---|---|
committer | Peter Stephenson <pws@users.sourceforge.net> | 2003-03-24 12:56:56 +0000 |
commit | d8e418bff15614315cee0cc20cd890146dd086f4 (patch) | |
tree | cbab111fcf0febf316877e22a012089dfd12ab4b /Src/utils.c | |
parent | 187ce46d155281a587cd9e03cfeb9f0083610477 (diff) | |
download | zsh-d8e418bff15614315cee0cc20cd890146dd086f4.tar.gz zsh-d8e418bff15614315cee0cc20cd890146dd086f4.tar.xz zsh-d8e418bff15614315cee0cc20cd890146dd086f4.zip |
18376: Fix headers for wchar.h and some related gcc waringnings
Diffstat (limited to 'Src/utils.c')
-rw-r--r-- | Src/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Src/utils.c b/Src/utils.c index 57a5e6771..6671c62d9 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -3395,8 +3395,8 @@ getkeystring(char *s, int *len, int fromwhere, int *misc) for (i=(*s == 'u' ? 4 : 8); i>0; i--) { if (*++s && idigit(*s)) wval = wval * 16 + (*s - '0'); - else if (*s && (*s >= 'a' && *s <= 'f') || - (*s >= 'A' && *s <= 'F')) + else if (*s && ((*s >= 'a' && *s <= 'f') || + (*s >= 'A' && *s <= 'F'))) wval = wval * 16 + (*s & 0x1f) + 9; else { s--; @@ -3430,7 +3430,7 @@ getkeystring(char *s, int *len, int fromwhere, int *misc) *len = t - buf; return buf; } - iconv(cd, &inptr, &inbytes, &outptr, &outbytes); + iconv(cd, (const char **)&inptr, &inbytes, &outptr, &outbytes); iconv_close(cd); count = wctomb(t, *outbuf); #endif |