diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-15 08:26:54 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-15 08:26:54 +0000 |
| commit | ad73c8b34828469b242de6c9afe1e72993af695b (patch) | |
| tree | f32a4eb01cfb6d818562b4a7be4f1d4cfda7ba30 | |
| parent | 9eab65b3f088d8109cdc27888afcb763e5d5181c (diff) | |
* enc/utf_8.c: renamed as IANA name.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15061 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 2 | ||||
| -rw-r--r-- | common.mk | 2 | ||||
| -rw-r--r-- | enc/utf_8.c (renamed from enc/utf8.c) | 8 |
4 files changed, 13 insertions, 5 deletions
@@ -1,3 +1,7 @@ +Tue Jan 15 17:26:51 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * enc/utf_8.c: renamed as IANA name. + Tue Jan 15 16:59:31 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * ruby.c (proc_options): encoding libraries cannot be loaded until @@ -136,7 +140,7 @@ Mon Jan 14 13:49:26 2008 Tanaka Akira <akr@fsij.org> Mon Jan 14 12:33:07 2008 Eric Hodel <drbrain@segment7.net> * lib/rdoc/markup*: Renamespace from SM::SimpleMarkup to - RDoc::Markup. + RDoc::Markup. Mon Jan 14 10:45:45 2008 Martin Duerst <duerst@it.aoyama.ac.jp> diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index 130465753f..f2bb6c7c5e 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -565,7 +565,7 @@ st.$(OBJEXT): win32.h string.$(OBJEXT): win32.h struct.$(OBJEXT): win32.h time.$(OBJEXT): win32.h -utf8.$(OBJEXT): win32.h +utf_8.$(OBJEXT): win32.h util.$(OBJEXT): win32.h variable.$(OBJEXT): win32.h version.$(OBJEXT): win32.h @@ -668,7 +668,7 @@ us_ascii.$(OBJEXT): {$(VPATH)}us_ascii.c {$(VPATH)}regenc.h {$(VPATH)}config.h \ unicode.$(OBJEXT): {$(VPATH)}unicode.c {$(VPATH)}regint.h \ {$(VPATH)}config.h {$(VPATH)}defines.h {$(VPATH)}regenc.h \ {$(VPATH)}oniguruma.h {$(VPATH)}st.h -utf8.$(OBJEXT): {$(VPATH)}utf8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \ +utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \ {$(VPATH)}defines.h {$(VPATH)}oniguruma.h INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc \ diff --git a/enc/utf8.c b/enc/utf_8.c index 88daf8799e..b048d185b2 100644 --- a/enc/utf8.c +++ b/enc/utf_8.c @@ -1,5 +1,5 @@ /********************************************************************** - utf8.c - Oniguruma (regular expression library) + utf_8.c - Oniguruma (regular expression library) **********************************************************************/ /*- * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> @@ -29,6 +29,10 @@ #include "regenc.h" +OnigEncodingDeclare(UTF_8); +#undef ONIG_ENCODING_UTF8 +#define ONIG_ENCODING_UTF8 (&OnigEncodingName(UTF_8)) + #define USE_INVALID_CODE_SCHEME #ifdef USE_INVALID_CODE_SCHEME @@ -462,7 +466,7 @@ get_case_fold_codes_by_str(OnigCaseFoldType flag, flag, p, end, items); } -OnigEncodingDefine(utf8, UTF8) = { +OnigEncodingDefine(utf_8, UTF_8) = { mbc_enc_len, "UTF-8", /* name */ 6, /* max byte length */ |