From 2fc973796a17daa944826d66dfc99b68863dbaa1 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 1 May 2016 18:27:41 +0000
Subject: [PATCH] fix mixed declaration on non UNALIGNED_WORD_ACCESS

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54877 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 string.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/string.c b/string.c
index 6d90ce9085..459b6e9a4d 100644
--- a/string.c
+++ b/string.c
@@ -422,6 +422,7 @@ VALUE rb_fs;
 static inline const char *
 search_nonascii(const char *p, const char *e)
 {
+    const uintptr_t *s, *t;
 #if SIZEOF_VOIDP == 8
 # define NONASCII_MASK 0x8080808080808080ULL
 #elif SIZEOF_VOIDP == 4
@@ -450,8 +451,8 @@ search_nonascii(const char *p, const char *e)
 #else
     {
 #endif
-	const uintptr_t *s = (const uintptr_t *)p;
-	const uintptr_t *t = (const uintptr_t *)(e - (SIZEOF_VOIDP-1));
+	s = (const uintptr_t *)p;
+	t = (const uintptr_t *)(e - (SIZEOF_VOIDP-1));
 	for (;s < t; s++) {
 	    if (*s & NONASCII_MASK) {
 #ifdef WORDS_BIGENDIAN