16adc8f350
OpenTTD due to a conflict of ``type'' being defined (differently) and used
in both libc++ and the game itself:
In file included from /usr/include/c++/v1/math.h:310:
/usr/include/c++/v1/limits:234:95: error: member reference base type 'int'
is not a structure or union
_LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN()
_NOEXCEPT {return type(0);}
.../openttd-1.7.1/src/3rdparty/squirrel/squirrel/sqobject.h:99:25: note:
expanded from macro 'type'
#define type(obj) ((obj)._type)
Mend the problem by #includ'ing <math.h> prior to Squirrel's (programming
language OpenTTD uses internally for scripting).
Reported by: pkg-fallout
13 lines
322 B
C++
13 lines
322 B
C++
--- 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"
|