From ed540e8bdfca1e93e1285add58b1206408e19441 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 8 Jan 2008 13:35:24 +0000 Subject: * encoding.c, Makefile.in, include/ruby/oniguruma.h, enc/Makefile.in: fix rules for UTF-{16,32}{BE,LE}. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- include/ruby/oniguruma.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'include') diff --git a/include/ruby/oniguruma.h b/include/ruby/oniguruma.h index 7b11b51780..f183951a27 100644 --- a/include/ruby/oniguruma.h +++ b/include/ruby/oniguruma.h @@ -189,10 +189,10 @@ ONIG_EXTERN OnigEncodingType OnigEncodingISO_8859_14; ONIG_EXTERN OnigEncodingType OnigEncodingISO_8859_15; ONIG_EXTERN OnigEncodingType OnigEncodingISO_8859_16; ONIG_EXTERN OnigEncodingType OnigEncodingUTF8; -ONIG_EXTERN OnigEncodingType OnigEncodingUTF16_BE; -ONIG_EXTERN OnigEncodingType OnigEncodingUTF16_LE; -ONIG_EXTERN OnigEncodingType OnigEncodingUTF32_BE; -ONIG_EXTERN OnigEncodingType OnigEncodingUTF32_LE; +ONIG_EXTERN OnigEncodingType OnigEncodingUTF_16BE; +ONIG_EXTERN OnigEncodingType OnigEncodingUTF_16LE; +ONIG_EXTERN OnigEncodingType OnigEncodingUTF_32BE; +ONIG_EXTERN OnigEncodingType OnigEncodingUTF_32LE; ONIG_EXTERN OnigEncodingType OnigEncodingEUC_JP; ONIG_EXTERN OnigEncodingType OnigEncodingEUC_TW; ONIG_EXTERN OnigEncodingType OnigEncodingEUC_KR; @@ -221,10 +221,10 @@ ONIG_EXTERN OnigEncodingType OnigEncodingGB18030; #define ONIG_ENCODING_ISO_8859_15 (&OnigEncodingISO_8859_15) #define ONIG_ENCODING_ISO_8859_16 (&OnigEncodingISO_8859_16) #define ONIG_ENCODING_UTF8 (&OnigEncodingUTF8) -#define ONIG_ENCODING_UTF16_BE (&OnigEncodingUTF16_BE) -#define ONIG_ENCODING_UTF16_LE (&OnigEncodingUTF16_LE) -#define ONIG_ENCODING_UTF32_BE (&OnigEncodingUTF32_BE) -#define ONIG_ENCODING_UTF32_LE (&OnigEncodingUTF32_LE) +#define ONIG_ENCODING_UTF_16BE (&OnigEncodingUTF_16BE) +#define ONIG_ENCODING_UTF_16LE (&OnigEncodingUTF_16LE) +#define ONIG_ENCODING_UTF_32BE (&OnigEncodingUTF_32BE) +#define ONIG_ENCODING_UTF_32LE (&OnigEncodingUTF_32LE) #define ONIG_ENCODING_EUC_JP (&OnigEncodingEUC_JP) #define ONIG_ENCODING_EUC_TW (&OnigEncodingEUC_TW) #define ONIG_ENCODING_EUC_KR (&OnigEncodingEUC_KR) -- cgit v1.2.3