mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* include/ruby/defines.h: no longer provide DEFAULT_KCODE.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13640 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b5b6d1f0ea
commit
bd00bb3ef7
5 changed files with 9 additions and 35 deletions
|
@ -1,3 +1,7 @@
|
|||
Sat Oct 6 02:34:18 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||
|
||||
* include/ruby/defines.h: no longer provide DEFAULT_KCODE.
|
||||
|
||||
Fri Oct 5 21:24:59 2007 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* re.c (rb_reg_s_union_m): Regexp.union accepts single argument which
|
||||
|
|
14
configure.in
14
configure.in
|
@ -893,20 +893,6 @@ AC_ARG_WITH(valgrind,
|
|||
[ --with-valgrind enable valgrind memcheck support.],
|
||||
[AC_CHECK_HEADERS(valgrind/memcheck.h)])
|
||||
|
||||
dnl default value for $KANJI
|
||||
DEFAULT_KCODE="KCODE_NONE"
|
||||
|
||||
AC_ARG_WITH(default-kcode,
|
||||
[ --with-default-kcode=CODE specify default value for \$KCODE (utf8|euc|sjis|none)],
|
||||
[case $withval in
|
||||
utf8) DEFAULT_KCODE="KCODE_UTF8";;
|
||||
euc) DEFAULT_KCODE="KCODE_EUC";;
|
||||
sjis) DEFAULT_KCODE="KCODE_SJIS";;
|
||||
none) DEFAULT_KCODE="KCODE_NONE";;
|
||||
*) AC_MSG_WARN($withval is not valid kcode; ignored);;
|
||||
esac])
|
||||
AC_DEFINE_UNQUOTED(DEFAULT_KCODE, $DEFAULT_KCODE)
|
||||
|
||||
dnl wheather use dln_a_out or not
|
||||
AC_ARG_WITH(dln-a-out,
|
||||
[ --with-dln-a-out use dln_a_out if possible], [
|
||||
|
|
|
@ -106,15 +106,6 @@ void xfree(void*);
|
|||
#endif
|
||||
#endif
|
||||
|
||||
/* define RUBY_USE_EUC/SJIS for default kanji-code */
|
||||
#ifndef DEFAULT_KCODE
|
||||
#if defined(DOSISH) || defined(__CYGWIN__) || defined(__MACOS__) || defined(OS2)
|
||||
#define DEFAULT_KCODE KCODE_SJIS
|
||||
#else
|
||||
#define DEFAULT_KCODE KCODE_EUC
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __NeXT__
|
||||
/* NextStep, OpenStep, Rhapsody */
|
||||
#ifndef S_IRUSR
|
||||
|
|
11
re.c
11
re.c
|
@ -152,7 +152,7 @@ rb_memsearch(const void *x0, long m, const void *y0, long n)
|
|||
#define ARG_KCODE_UTF8 (ARG_KCODE_UNIT * 4)
|
||||
#define ARG_KCODE_MASK (ARG_KCODE_UNIT * 7)
|
||||
|
||||
static int reg_kcode = DEFAULT_KCODE;
|
||||
static int reg_kcode = KCODE_NONE;
|
||||
|
||||
static int
|
||||
char_to_option(int c)
|
||||
|
@ -2406,14 +2406,7 @@ Init_Regexp(void)
|
|||
rb_eRegexpError = rb_define_class("RegexpError", rb_eStandardError);
|
||||
|
||||
onigenc_set_default_caseconv_table((UChar*)casetable);
|
||||
if (DEFAULT_KCODE == KCODE_EUC)
|
||||
onigenc_set_default_encoding(ONIG_ENCODING_EUC_JP);
|
||||
else if (DEFAULT_KCODE == KCODE_SJIS)
|
||||
onigenc_set_default_encoding(ONIG_ENCODING_SJIS);
|
||||
else if (DEFAULT_KCODE == KCODE_UTF8)
|
||||
onigenc_set_default_encoding(ONIG_ENCODING_UTF8);
|
||||
else
|
||||
onigenc_set_default_encoding(ONIG_ENCODING_ASCII);
|
||||
onigenc_set_default_encoding(ONIG_ENCODING_ASCII);
|
||||
|
||||
rb_define_virtual_variable("$~", match_getter, match_setter);
|
||||
rb_define_virtual_variable("$&", last_match_getter, 0);
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#define RUBY_VERSION "1.9.0"
|
||||
#define RUBY_RELEASE_DATE "2007-10-05"
|
||||
#define RUBY_RELEASE_DATE "2007-10-06"
|
||||
#define RUBY_VERSION_CODE 190
|
||||
#define RUBY_RELEASE_CODE 20071005
|
||||
#define RUBY_RELEASE_CODE 20071006
|
||||
#define RUBY_PATCHLEVEL 0
|
||||
|
||||
#define RUBY_VERSION_MAJOR 1
|
||||
|
@ -9,7 +9,7 @@
|
|||
#define RUBY_VERSION_TEENY 0
|
||||
#define RUBY_RELEASE_YEAR 2007
|
||||
#define RUBY_RELEASE_MONTH 10
|
||||
#define RUBY_RELEASE_DAY 5
|
||||
#define RUBY_RELEASE_DAY 6
|
||||
|
||||
#ifdef RUBY_EXTERN
|
||||
RUBY_EXTERN const char ruby_version[];
|
||||
|
|
Loading…
Reference in a new issue