1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* configure.in: revert r42008. strcasecmp() uses the current locale.

Browse Source 
* 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
This commit is contained in:
glass 2013-07-16 12:49:01 +00:00
parent a0d9bd4445
commit 13a1fd6d82
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Tue Jul 16 21:46:03 2013 Masaki Matsushita <glass.saga@gmail.com>
* 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 <glass.saga@gmail.com> Tue Jul 16 21:07:04 2013 Masaki Matsushita <glass.saga@gmail.com>
* configure.in: check strcasecmp(). * configure.in: check strcasecmp().

1
configure.in
View File

@ -1823,7 +1823,6 @@ AC_CHECK_FUNCS(sigaltstack)
AC_CHECK_FUNCS(sigprocmask) AC_CHECK_FUNCS(sigprocmask)
AC_CHECK_FUNCS(sinh) AC_CHECK_FUNCS(sinh)
AC_CHECK_FUNCS(spawnv) AC_CHECK_FUNCS(spawnv)
AC_CHECK_FUNCS(strcasecmp)
AC_CHECK_FUNCS(symlink) AC_CHECK_FUNCS(symlink)
AC_CHECK_FUNCS(syscall) AC_CHECK_FUNCS(syscall)
AC_CHECK_FUNCS(sysconf) AC_CHECK_FUNCS(sysconf)

4
include/ruby/ruby.h
View File

@ -1808,11 +1808,7 @@ int rb_toupper(int c);
#define TOUPPER(c) rb_toupper((unsigned char)(c)) #define TOUPPER(c) rb_toupper((unsigned char)(c))
#define TOLOWER(c) rb_tolower((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); int st_strcasecmp(const char *s1, const char *s2);
#endif
int st_strncasecmp(const char *s1, const char *s2, size_t n); int st_strncasecmp(const char *s1, const char *s2, size_t n);
#define STRCASECMP(s1, s2) (st_strcasecmp((s1), (s2))) #define STRCASECMP(s1, s2) (st_strcasecmp((s1), (s2)))
#define STRNCASECMP(s1, s2, n) (st_strncasecmp((s1), (s2), (n))) #define STRNCASECMP(s1, s2, n) (st_strncasecmp((s1), (s2), (n)))

2
st.c
View File

@ -1524,7 +1524,6 @@ strhash(st_data_t arg)
} }
#endif #endif
#ifndef HAVE_STRCASECMP
int int
st_strcasecmp(const char *s1, const char *s2) st_strcasecmp(const char *s1, const char *s2)
{ {
@ -1548,7 +1547,6 @@ st_strcasecmp(const char *s1, const char *s2)
} }
} }
} }
#endif
int int
st_strncasecmp(const char *s1, const char *s2, size_t n) st_strncasecmp(const char *s1, const char *s2, size_t n)