Commit 371834d7 authored by Tristan Cavelier's avatar Tristan Cavelier

xxx SIZE_MAX

parent dd43f653
...@@ -14,7 +14,7 @@ url = https://github.com/ONLYOFFICE/core/archive/f84ee9a5a30b79a2995a96f8019978d ...@@ -14,7 +14,7 @@ url = https://github.com/ONLYOFFICE/core/archive/f84ee9a5a30b79a2995a96f8019978d
md5sum = 2ead88646094941dc8de12cdc72ba3b2 md5sum = 2ead88646094941dc8de12cdc72ba3b2
patch-options = -p0 patch-options = -p0
patches = patches =
${:_profile_base_location_}/rewrite-scripts.patch#7a6ea9bea94daeb01b9e0f3c061dd9fb ${:_profile_base_location_}/rewrite-scripts.patch#a37c5e278cd2e1cd92621beb967c2c0a
${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de ${:_profile_base_location_}/cryptopp.patch#a2f892e23e13952539d1acfd013be7de
# ${:_profile_base_location_}/avoid-7z.patch#0dd7356c1a766ec14e0e8bcafcffe1a7 # ${:_profile_base_location_}/avoid-7z.patch#0dd7356c1a766ec14e0e8bcafcffe1a7
# error: 'to_wstring' is not a member of 'std' -> http://www.cplusplus.com/forum/general/109469/ # error: 'to_wstring' is not a member of 'std' -> http://www.cplusplus.com/forum/general/109469/
......
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
+git apply ../slapos-v8.patch +git apply ../slapos-v8.patch
--- /dev/null 2017-01-30 09:00:09.914078893 +0100 --- /dev/null 2017-01-30 09:00:09.914078893 +0100
+++ Common/3dParty/v8/slapos-v8.patch 2017-02-01 16:39:12.093279611 +0100 +++ Common/3dParty/v8/slapos-v8.patch 2017-02-01 16:39:12.093279611 +0100
@@ -0,0 +1,103 @@ @@ -0,0 +1,105 @@
+diff --git a/build/standalone.gypi b/build/standalone.gypi +diff --git a/build/standalone.gypi b/build/standalone.gypi
+index f804715..48eea0f 100644 +index f804715..48eea0f 100644
+--- a/build/standalone.gypi +--- a/build/standalone.gypi
...@@ -387,18 +387,20 @@ ...@@ -387,18 +387,20 @@
+ #include "src/compiler/code-generator.h" + #include "src/compiler/code-generator.h"
+ +
+diff --git a/src/compiler/instruction-selector.cc b/src/compiler/instruction-selector.cc +diff --git a/src/compiler/instruction-selector.cc b/src/compiler/instruction-selector.cc
+index 053c646..6142bc5 100644 +index 053c646..08e4102 100644
+--- a/src/compiler/instruction-selector.cc +--- a/src/compiler/instruction-selector.cc
++++ b/src/compiler/instruction-selector.cc ++++ b/src/compiler/instruction-selector.cc
+@@ -5,6 +5,7 @@ +@@ -324,6 +324,9 @@ InstructionOperand OperandForDeopt(OperandGenerator* g, Node* input,
+ #include "src/compiler/instruction-selector.h" + }
+ +
+ #include <limits>
++#include <stdint.h>
+ +
+ #include "src/base/adapters.h" ++#ifndef SIZE_MAX
+ #include "src/compiler/instruction-selector-impl.h" ++#define SIZE_MAX (4294967295U)
+@@ -387,6 +388,7 @@ size_t AddOperandToStateValueDescriptor(StateValueDescriptor* descriptor, ++#endif
+ class StateObjectDeduplicator {
+ public:
+ explicit StateObjectDeduplicator(Zone* zone) : objects_(zone) {}
+@@ -387,6 +390,7 @@ size_t AddOperandToStateValueDescriptor(StateValueDescriptor* descriptor,
+ return 1; + return 1;
+ } + }
+ } + }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment