Index: branches/2018Q3/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp =================================================================== --- branches/2018Q3/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp (nonexistent) +++ branches/2018Q3/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp (revision 476830) @@ -0,0 +1,24 @@ +After https://reviews.llvm.org/rL301060 build fails: + +In file included from sqvm.cpp:5: +In file included from /usr/include/c++/v1/math.h:310: +/usr/include/c++/v1/limits:148:85: error: expected expression + _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type min() _NOEXCEPT {return type();} + ^ +../../../../src/include/scripting/squirrel/sqobject.h:99:24: note: expanded from macro 'type' +#define type(obj) ((obj)._type) + ^ + +--- src/sdk/scripting/squirrel/sqvm.cpp.orig 2013-08-18 05:51:11 UTC ++++ src/sdk/scripting/squirrel/sqvm.cpp +@@ -1,9 +1,9 @@ + /* + see copyright notice in squirrel.h + */ +-#include "sqpcheader.h" + #include + #include ++#include "sqpcheader.h" + #include "sqopcodes.h" + #include "sqfuncproto.h" + #include "sqvm.h" Property changes on: branches/2018Q3/devel/codeblocks-devel/files/patch-src_sdk_scripting_squirrel_sqvm.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q3 =================================================================== --- branches/2018Q3 (revision 476829) +++ branches/2018Q3 (revision 476830) Property changes on: branches/2018Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r476829