X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/4a9cd8f24abba232b4a07ccdda4c6f109d27acac..c0beb08772ddefc0e8bb705b08cebc71ec92815d:/src/scan-gram.l diff --git a/src/scan-gram.l b/src/scan-gram.l index e2e08f9a..d375fc12 100644 --- a/src/scan-gram.l +++ b/src/scan-gram.l @@ -39,7 +39,6 @@ #include #include #include -#include #include @@ -942,8 +941,8 @@ handle_syncline (char *args, location loc) { char *after_num; unsigned long int lineno = strtoul (args, &after_num, 10); - char *file = mbschr (after_num, '"') + 1; - *mbschr (file, '"') = '\0'; + char *file = strchr (after_num, '"') + 1; + *strchr (file, '"') = '\0'; if (INT_MAX <= lineno) { warn_at (loc, _("line number overflow")); @@ -968,7 +967,7 @@ unexpected_end (boundary start, char const *msgid, char const *token_end) loc.end = scanner_cursor; token_end = quote (token_end); // Instead of '\'', display "'". - if (STREQ (token_end, "'\\''", '\'', '\\', '\'', '\'', 0,0,0,0,0)) + if (STREQ (token_end, "'\\''")) token_end = "\"'\""; complain_at (loc, _(msgid), token_end); }