Skip to content

Commit

Permalink
Version 4.2.77.7 (cherry-pick)
Browse files Browse the repository at this point in the history
Merged 68d5f91

Fix build on solaris platforms

BUG=3935
LOG=N
TBR=svenpanne@chromium.org

Review URL: https://codereview.chromium.org/1018333002

Cr-Commit-Position: refs/branch-heads/4.2@{crosswalk-project#8}
Cr-Branched-From: 3dfd929-refs/heads/4.2.77@{crosswalk-project#2}
Cr-Branched-From: e011092-refs/heads/master@{#26757}
  • Loading branch information
jeisinger committed Mar 19, 2015
1 parent 555f5bc commit 49599cb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ Jay Freeman <saurik@saurik.com>
James Pike <g00gle@chilon.net>
Jianghua Yang <jianghua.yjh@alibaba-inc.com>
Joel Stanley <joel@jms.id.au>
Johan Bergström <johan@bergstroem.nu>
Jonathan Liu <net147@gmail.com>
Kang-Hao (Kenny) Lu <kennyluck@csail.mit.edu>
Luis Reis <luis.m.reis@gmail.com>
Expand Down
2 changes: 1 addition & 1 deletion include/v8-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 4
#define V8_MINOR_VERSION 2
#define V8_BUILD_NUMBER 77
#define V8_PATCH_LEVEL 6
#define V8_PATCH_LEVEL 7

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
2 changes: 2 additions & 0 deletions src/base/platform/platform-posix.cc
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,8 @@ int OS::GetCurrentThreadId() {
return static_cast<int>(gettid());
#elif V8_OS_AIX
return static_cast<int>(thread_self());
#elif V8_OS_SOLARIS
return static_cast<int>(pthread_self());
#else
return static_cast<int>(reinterpret_cast<intptr_t>(pthread_self()));
#endif
Expand Down

0 comments on commit 49599cb

Please sign in to comment.