Make the return type of rb_char_next the same as CharNext

nobu · nobu · commit 0395aa6bbb23 · 2021-04-08T21:41:00.000+09:00
diff --git a/eval_intern.h b/eval_intern.h
@@ -303,14 +303,14 @@ VALUE rb_ec_backtrace_location_ary(const rb_execution_context_t *ec, long lev, l
 #ifndef CharNext		/* defined as CharNext[AW] on Windows. */
 # ifdef HAVE_MBLEN
 #  define CharNext(p) rb_char_next(p)
-static inline const char *
+static inline char *
 rb_char_next(const char *p)
 {
     if (p) {
         int len = mblen(p, RUBY_MBCHAR_MAXSIZE);
         p += len > 0 ? len : 1;
     }
-    return p;
+    return (char *)p;
 }
 # else
 #  define CharNext(p) ((p) + 1)

Original file line number	Diff line number	Diff line change
`@@ -303,14 +303,14 @@ VALUE rb_ec_backtrace_location_ary(const rb_execution_context_t *ec, long lev, l`
`303`	`303`	`#ifndef CharNext /* defined as CharNext[AW] on Windows. */`
`304`	`304`	`# ifdef HAVE_MBLEN`
`305`	`305`	`# define CharNext(p) rb_char_next(p)`
`306`		`-static inline const char *`
	`306`	`+static inline char *`
`307`	`307`	`rb_char_next(const char *p)`
`308`	`308`	`{`
`309`	`309`	`if (p) {`
`310`	`310`	`int len = mblen(p, RUBY_MBCHAR_MAXSIZE);`
`311`	`311`	`p += len > 0 ? len : 1;`
`312`	`312`	`}`
`313`		`- return p;`
	`313`	`+ return (char *)p;`
`314`	`314`	`}`
`315`	`315`	`# else`
`316`	`316`	`# define CharNext(p) ((p) + 1)`