diff options
| author | isaacs <i@izs.me> | 2013-06-25 11:12:33 -0700 |
|---|---|---|
| committer | isaacs <i@izs.me> | 2013-06-25 11:12:33 -0700 |
| commit | adf9b67e591fe1df9589412a75bad357a9410aa3 (patch) | |
| tree | 5d17c3a12c8d6d0edb67b596de4af90063ff1f2f /src/string_bytes.cc | |
| parent | b255f4c10a80343f9ce1cee56d0288361429e214 (diff) | |
| parent | 3fac4157fef1b083e199e04affbb6432f70861c2 (diff) | |
| download | android-node-v8-adf9b67e591fe1df9589412a75bad357a9410aa3.tar.gz android-node-v8-adf9b67e591fe1df9589412a75bad357a9410aa3.tar.bz2 android-node-v8-adf9b67e591fe1df9589412a75bad357a9410aa3.zip | |
Merge remote-tracking branch 'ry/v0.10' into master
Conflicts:
ChangeLog
deps/uv/ChangeLog
deps/uv/src/unix/stream.c
deps/uv/src/version.c
deps/v8/build/common.gypi
deps/v8/src/frames.h
deps/v8/src/runtime.cc
deps/v8/test/mjsunit/debug-set-variable-value.js
lib/http.js
src/node_version.h
Diffstat (limited to 'src/string_bytes.cc')
| -rw-r--r-- | src/string_bytes.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/string_bytes.cc b/src/string_bytes.cc index db810037d9..fcea165fed 100644 --- a/src/string_bytes.cc +++ b/src/string_bytes.cc @@ -456,7 +456,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; @@ -509,7 +509,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; |