Date: Thu, 21 Sep 2017 23:26:46 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450309 - head/games/simutrans/files Message-ID: <201709212326.v8LNQkm1003520@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Thu Sep 21 23:26:45 2017 New Revision: 450309 URL: https://svnweb.freebsd.org/changeset/ports/450309 Log: games/simutrans: unbreak with libc++ 5.0 In file included from squirrel/squirrel/sqvm.cc:5: In file included from /usr/include/c++/v1/math.h:310: /usr/include/c++/v1/limits:233:91: error: member reference base type 'int' is not a structure or union _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type quiet_NaN() _NOEXCEPT {return type(0);} ^~~~~~~ squirrel/squirrel/sqobject.h:131:25: note: expanded from macro 'type' #define type(obj) ((obj)._type) ~~~~~^~~~~~ PR: 222402 Submitted by: chardon.frederic@gmail.com Reported by: pkg-fallout Added: head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cpp (contents, props changed) - copied, changed from r450308, head/games/openttd/files/patch-src_3rdparty_squirrel_squirrel_sqvm.cpp Copied and modified: head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cpp (from r450308, head/games/openttd/files/patch-src_3rdparty_squirrel_squirrel_sqvm.cpp) ============================================================================== --- head/games/openttd/files/patch-src_3rdparty_squirrel_squirrel_sqvm.cpp Thu Sep 21 21:18:50 2017 (r450308, copy source) +++ head/games/simutrans/files/patch-squirrel_squirrel_sqvm.cpp Thu Sep 21 23:26:45 2017 (r450309) @@ -1,13 +1,12 @@ ---- src/3rdparty/squirrel/squirrel/sqvm.cpp.orig 2017-06-13 18:34:58 UTC -+++ src/3rdparty/squirrel/squirrel/sqvm.cpp -@@ -4,9 +4,9 @@ - - #include "../../../stdafx.h" - -+#include <math.h> - #include <squirrel.h> - #include "sqpcheader.h" --#include <math.h> - #include "sqopcodes.h" - #include "sqfuncproto.h" - #include "sqvm.h" +--- squirrel/squirrel/sqvm.cc.orig 2017-02-17 12:54:05 UTC ++++ squirrel/squirrel/sqvm.cc +@@ -1,8 +1,8 @@ + /* + see copyright notice in squirrel.h + */ +-#include "sqpcheader.h" + #include <math.h> ++#include "sqpcheader.h" + #include <stdlib.h> + #include <limits.h> + #include "sqopcodes.h"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709212326.v8LNQkm1003520>