From 046831094b355d8d293d22a3ad5be5332307c96c Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 1 Jun 2014 22:06:11 +0000 Subject: constify rb_encoding and OnigEncoding * include/ruby/encoding.h: constify `rb_encoding` arguments. * include/ruby/oniguruma.h: constify `OnigEncoding` arguments. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46309 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- regenc.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'regenc.h') diff --git a/regenc.h b/regenc.h index 04a5e70db3..d7c6b60cf4 100644 --- a/regenc.h +++ b/regenc.h @@ -197,9 +197,9 @@ ONIG_EXTERN const unsigned short OnigEncAsciiCtypeTable[]; #ifdef ONIG_ENC_REGISTER -extern int ONIG_ENC_REGISTER(const char *, OnigEncodingType*); +extern int ONIG_ENC_REGISTER(const char *, OnigEncoding); #define OnigEncodingName(n) encoding_##n -#define OnigEncodingDeclare(n) static OnigEncodingType OnigEncodingName(n) +#define OnigEncodingDeclare(n) static const OnigEncodingType OnigEncodingName(n) #define OnigEncodingDefine(f,n) \ OnigEncodingDeclare(n); \ void Init_##f(void) { \ @@ -209,7 +209,7 @@ extern int ONIG_ENC_REGISTER(const char *, OnigEncodingType*); OnigEncodingDeclare(n) #else #define OnigEncodingName(n) OnigEncoding##n -#define OnigEncodingDeclare(n) OnigEncodingType OnigEncodingName(n) +#define OnigEncodingDeclare(n) const OnigEncodingType OnigEncodingName(n) #define OnigEncodingDefine(f,n) OnigEncodingDeclare(n) #endif -- cgit v1.2.3