diff --git a/common.gypi b/common.gypi index c8ecf1ffae8..5bc3d8666ab 100644 --- a/common.gypi +++ b/common.gypi @@ -36,7 +36,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.5', + 'v8_embedder_string': '-node.6', ##### V8 defaults for Node.js ##### diff --git a/deps/v8/src/base/platform/memory.h b/deps/v8/src/base/platform/memory.h index 0a68ee840f7..b5c675ac238 100644 --- a/deps/v8/src/base/platform/memory.h +++ b/deps/v8/src/base/platform/memory.h @@ -23,9 +23,9 @@ #include #endif // !V8_OS_DARWIN -#if (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN +#if (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN #define V8_HAS_MALLOC_USABLE_SIZE 1 -#endif // (V8_OS_POSIX && !V8_OS_AIX) || V8_OS_WIN +#endif // (V8_OS_POSIX && !V8_OS_AIX && !V8_OS_SOLARIS) || V8_OS_WIN namespace v8::base {