string_bytes: properly detect 64bit

tjfontaine · tjfontaine · commit a2c4ca09ed80 · 2013-06-19T17:16:35.000-07:00
diff --git a/src/string_bytes.cc b/src/string_bytes.cc
@@ -387,7 +387,7 @@ static bool contains_non_ascii(const char* src, size_t len) {
   }
 
 
-#if BITS_PER_LONG == 64
+#if defined(__x86_64__) || defined(_WIN64)
   const uintptr_t mask = 0x8080808080808080ll;
 #else
   const uintptr_t mask = 0x80808080l;
@@ -440,7 +440,7 @@ static void force_ascii(const char* src, char* dst, size_t len) {
     }
   }
 
-#if BITS_PER_LONG == 64
+#if defined(__x86_64__) || defined(_WIN64)
   const uintptr_t mask = ~0x8080808080808080ll;
 #else
   const uintptr_t mask = ~0x80808080l;

Original file line number	Diff line number	Diff line change
`@@ -387,7 +387,7 @@ static bool contains_non_ascii(const char* src, size_t len) {`
`387`	`387`	`}`
`388`	`388`
`389`	`389`
`390`		`-#if BITS_PER_LONG == 64`
	`390`	`+#if defined(__x86_64__) \|\| defined(_WIN64)`
`391`	`391`	`const uintptr_t mask = 0x8080808080808080ll;`
`392`	`392`	`#else`
`393`	`393`	`const uintptr_t mask = 0x80808080l;`
`@@ -440,7 +440,7 @@ static void force_ascii(const char* src, char* dst, size_t len) {`
`440`	`440`	`}`
`441`	`441`	`}`
`442`	`442`
`443`		`-#if BITS_PER_LONG == 64`
	`443`	`+#if defined(__x86_64__) \|\| defined(_WIN64)`
`444`	`444`	`const uintptr_t mask = ~0x8080808080808080ll;`
`445`	`445`	`#else`
`446`	`446`	`const uintptr_t mask = ~0x80808080l;`