diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-01 21:54:59 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-01 21:54:59 +0000 |
| commit | db37773e13fba8ccb28612361220638e702d4deb (patch) | |
| tree | 72ffe3fbbb7762810ec3780c3004408ee5d0d693 /enc/shift_jis.c | |
| parent | e1c33162cf821b5251559564242e0d91ad29a79c (diff) | |
| download | ruby-db37773e13fba8ccb28612361220638e702d4deb.tar.gz | |
* include/ruby/oniguruma.h: updated to follow Oniguruma 5.9.2.
* re.c (make_regexp): use onig_new() instead of onig_alloc_init().
* re.c (rb_reg_to_s): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26791 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc/shift_jis.c')
| -rw-r--r-- | enc/shift_jis.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/enc/shift_jis.c b/enc/shift_jis.c index b4d8592a27..f7614205af 100644 --- a/enc/shift_jis.c +++ b/enc/shift_jis.c @@ -2,7 +2,7 @@ sjis.c - Oniguruma (regular expression library) **********************************************************************/ /*- - * Copyright (c) 2002-2007 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> + * Copyright (c) 2002-2008 K.Kosako <sndgk393 AT ybb DOT ne DOT jp> * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -294,7 +294,7 @@ init_property_list(void) static int property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) { - st_data_t ctype; + hash_data_type ctype; PROPERTY_LIST_INIT_CHECK; @@ -302,7 +302,7 @@ property_name_to_ctype(OnigEncoding enc, UChar* p, UChar* end) return onigenc_minimum_property_name_to_ctype(enc, p, end); } - return ctype; + return (int)ctype; } static int |