# HG changeset patch # User Richard Stallman # Date 867824700 0 # Node ID 6959c7741ed219e0aa6ec8ba0460e2bfe266ec36 # Parent 6f2958d80ce3d008273d2dbad917a0913ada8f07 (re_search_2): Cast result of POS_ADDR_VSTRING. diff --git a/regex.c b/regex.c --- a/regex.c +++ b/regex.c @@ -3856,8 +3856,10 @@ /* Update STARTPOS to the next character boundary. */ if (multibyte) { - const unsigned char *p = POS_ADDR_VSTRING (startpos); - const unsigned char *pend = STOP_ADDR_VSTRING (startpos); + const unsigned char *p + = (const unsigned char *) POS_ADDR_VSTRING (startpos); + const unsigned char *pend + = (const unsigned char *) STOP_ADDR_VSTRING (startpos); int len = MULTIBYTE_FORM_LENGTH (p, pend - p); range -= len; @@ -3867,9 +3869,9 @@ } else { - range--; - startpos++; - } + range--; + startpos++; + } } else { @@ -3879,7 +3881,8 @@ /* Update STARTPOS to the previous character boundary. */ if (multibyte) { - const unsigned char *p = POS_ADDR_VSTRING (startpos); + const unsigned char *p + = (const unsigned char *) POS_ADDR_VSTRING (startpos); int len = 0; /* Find the head of multibyte form. */