From 13a1fd6d825de395249c1aa12681b1de37ee3001 Mon Sep 17 00:00:00 2001 From: glass Date: Tue, 16 Jul 2013 12:49:01 +0000 Subject: * configure.in: revert r42008. strcasecmp() uses the current locale. * include/ruby/ruby.h: ditto. * st.c (st_strcasecmp): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42009 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ configure.in | 1 - include/ruby/ruby.h | 4 ---- st.c | 2 -- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 68f0330fe2..0d2e77035d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Tue Jul 16 21:46:03 2013 Masaki Matsushita + + * configure.in: revert r42008. strcasecmp() uses the current locale. + + * include/ruby/ruby.h: ditto. + + * st.c (st_strcasecmp): ditto. + Tue Jul 16 21:07:04 2013 Masaki Matsushita * configure.in: check strcasecmp(). diff --git a/configure.in b/configure.in index e19f7209f4..48184e23cf 100644 --- a/configure.in +++ b/configure.in @@ -1823,7 +1823,6 @@ AC_CHECK_FUNCS(sigaltstack) AC_CHECK_FUNCS(sigprocmask) AC_CHECK_FUNCS(sinh) AC_CHECK_FUNCS(spawnv) -AC_CHECK_FUNCS(strcasecmp) AC_CHECK_FUNCS(symlink) AC_CHECK_FUNCS(syscall) AC_CHECK_FUNCS(sysconf) diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index df89b387dd..2fd5981a67 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1808,11 +1808,7 @@ int rb_toupper(int c); #define TOUPPER(c) rb_toupper((unsigned char)(c)) #define TOLOWER(c) rb_tolower((unsigned char)(c)) -#ifdef HAVE_STRCASECMP -#define st_strcasecmp strcasecmp -#else int st_strcasecmp(const char *s1, const char *s2); -#endif int st_strncasecmp(const char *s1, const char *s2, size_t n); #define STRCASECMP(s1, s2) (st_strcasecmp((s1), (s2))) #define STRNCASECMP(s1, s2, n) (st_strncasecmp((s1), (s2), (n))) diff --git a/st.c b/st.c index fff79f5571..e86171927b 100644 --- a/st.c +++ b/st.c @@ -1524,7 +1524,6 @@ strhash(st_data_t arg) } #endif -#ifndef HAVE_STRCASECMP int st_strcasecmp(const char *s1, const char *s2) { @@ -1548,7 +1547,6 @@ st_strcasecmp(const char *s1, const char *s2) } } } -#endif int st_strncasecmp(const char *s1, const char *s2, size_t n) -- cgit v1.2.3