Version 4.1.0.5 (cherry-pick)

Merged 76ce4a9 [d8] Fix V8 external snapshot for Windows. BUG=421063,439661 LOG=N [email protected], [email protected] Review URL: https://codereview.chromium.org/838383007 Cr-Commit-Position: refs/branch-heads/4.1@{#6} Cr-Branched-From: 2e08d2a-refs/heads/candidates@{#25353}
crosswalk-project · Jan 13, 2015 · 9fcb3ee · 9fcb3ee
1 parent e333d39
commit 9fcb3ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/d8.cc b/src/d8.cc
@@ -1577,7 +1577,7 @@ class StartupDataHandler {
     const char* last_slash = strrchr(exec_path, '/');
     if (last_slash) {
       int after_slash = last_slash - exec_path + 1;
-      int name_length = strlen(name);
+      int name_length = static_cast<int>(strlen(name));
       *buffer =
           reinterpret_cast<char*>(calloc(after_slash + name_length + 1, 1));
       strncpy(*buffer, exec_path, after_slash);

diff --git a/src/version.cc b/src/version.cc
@@ -35,7 +35,7 @@
 #define MAJOR_VERSION     4
 #define MINOR_VERSION     1
 #define BUILD_NUMBER      0
-#define PATCH_LEVEL       4
+#define PATCH_LEVEL       5
 // Use 1 for candidates and 0 otherwise.
 // (Boolean macro values are not supported by all preprocessors.)
 #define IS_CANDIDATE_VERSION 0