summary refs log tree commit diff
path: root/Src/glob.c
diff options
context:
space:
mode:
authorJun T <takimoto-j@kba.biglobe.ne.jp>2014-06-10 23:46:15 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2014-06-10 23:46:15 -0700
commite1fbf76de0b7682ed0f66883073037fee581e316 (patch)
treeab469eb9924cc9d36d7e7a383842fb1e5c5f0447 /Src/glob.c
parent6336347c9e02ebae565b2d62987d1052bcba5567 (diff)
downloadzsh-e1fbf76de0b7682ed0f66883073037fee581e316.tar.gz
zsh-e1fbf76de0b7682ed0f66883073037fee581e316.tar.xz
zsh-e1fbf76de0b7682ed0f66883073037fee581e316.zip
32765: fix build when not MULTIBYTE_SUPPORT
Diffstat (limited to 'Src/glob.c')
-rw-r--r--Src/glob.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/Src/glob.c b/Src/glob.c
index 15a5f70b7..6403e46f7 100644
--- a/Src/glob.c
+++ b/Src/glob.c
@@ -2129,7 +2129,13 @@ bracechardots(char *str, convchar_t *c1p, convchar_t *c2p)
 	pconv = pnext;
     MB_METACHARINIT();
     pnext += MB_METACHARLENCONV(pconv, &cstart);
-    if (cstart == WEOF || pnext[0] != '.' || pnext[1] != '.')
+    if (
+#ifdef MULTIBYTE_SUPPORT
+	cstart == WEOF ||
+#else
+	!cstart ||
+#endif
+	pnext[0] != '.' || pnext[1] != '.')
 	return 0;
     pnext += 2;
     if (itok(*pnext)) {
@@ -2140,7 +2146,13 @@ bracechardots(char *str, convchar_t *c1p, convchar_t *c2p)
 	pconv = pnext;
     MB_METACHARINIT();
     pnext += MB_METACHARLENCONV(pconv, &cend);
-    if (cend == WEOF || *pnext != Outbrace)
+    if (
+#ifdef MULTIBYTE_SUPPORT
+	cend == WEOF ||
+#else
+	!cend ||
+#endif
+	*pnext != Outbrace)
 	return 0;
     if (c1p)
 	*c1p = cstart;