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

fix mixed declaration on non UNALIGNED_WORD_ACCESS

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2016-05-01 18:27:41 +00:00
parent af97057c4d
commit 2fc973796a
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
string.c
View File

@ -422,6 +422,7 @@ VALUE rb_fs;
static inline const char * static inline const char *
search_nonascii(const char *p, const char *e) search_nonascii(const char *p, const char *e)
{ {
const uintptr_t *s, *t;
#if SIZEOF_VOIDP == 8 #if SIZEOF_VOIDP == 8
# define NONASCII_MASK 0x8080808080808080ULL # define NONASCII_MASK 0x8080808080808080ULL
#elif SIZEOF_VOIDP == 4 #elif SIZEOF_VOIDP == 4
@ -450,8 +451,8 @@ search_nonascii(const char *p, const char *e)
#else #else
{ {
#endif #endif
const uintptr_t *s = (const uintptr_t *)p; s = (const uintptr_t *)p;
const uintptr_t *t = (const uintptr_t *)(e - (SIZEOF_VOIDP-1)); t = (const uintptr_t *)(e - (SIZEOF_VOIDP-1));
for (;s < t; s++) { for (;s < t; s++) {
if (*s & NONASCII_MASK) { if (*s & NONASCII_MASK) {
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN