mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/nkf/nkf-utf8/nkf.c: import nkf 7f18e30.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31175 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d815916071
commit
e3c3733a30
2 changed files with 7 additions and 3 deletions
|
@ -1,3 +1,7 @@
|
|||
Fri Mar 25 12:14:58 2011 NARUSE, Yui <naruse@ruby-lang.org>
|
||||
|
||||
* ext/nkf/nkf-utf8/nkf.c: import nkf 7f18e30.
|
||||
|
||||
Fri Mar 25 11:49:29 2011 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||
|
||||
* test/ruby/test_process.rb (TestProcess#test_no_curdir): skip silently
|
||||
|
|
|
@ -21,7 +21,7 @@
|
|||
* 3. This notice may not be removed or altered from any source distribution.
|
||||
*/
|
||||
#define NKF_VERSION "2.1.1"
|
||||
#define NKF_RELEASE_DATE "2010-08-08"
|
||||
#define NKF_RELEASE_DATE "2011-03-25"
|
||||
#define COPY_RIGHT \
|
||||
"Copyright (C) 1987, FUJITSU LTD. (I.Ichikawa).\n" \
|
||||
"Copyright (C) 1996-2010, The nkf Project."
|
||||
|
@ -3878,7 +3878,7 @@ static const unsigned char *mime_pattern[] = {
|
|||
|
||||
/* $B3:Ev$9$k%3!<%I$NM%@hEY$r>e$2$k$?$a$NL\0u(B */
|
||||
nkf_char (*mime_priority_func[])(nkf_char c2, nkf_char c1, nkf_char c0) = {
|
||||
e_iconv, s_iconv, 0, 0, 0, 0,
|
||||
e_iconv, s_iconv, 0, 0, 0, 0, 0,
|
||||
#if defined(UTF8_INPUT_ENABLE)
|
||||
w_iconv, w_iconv,
|
||||
#endif
|
||||
|
@ -4259,7 +4259,7 @@ numchar_getc(FILE *f)
|
|||
nkf_char (*u)(nkf_char c ,FILE *f) = i_nungetc;
|
||||
int i = 0, j;
|
||||
nkf_char buf[12];
|
||||
long c = -1;
|
||||
nkf_char c = -1;
|
||||
|
||||
buf[i] = (*g)(f);
|
||||
if (buf[i] == '&'){
|
||||
|
|
Loading…
Reference in a new issue