15 lines
537 B
Diff
15 lines
537 B
Diff
|
diff -uNr OpenTTD-1.9.1/src/3rdparty/squirrel/squirrel/sqvm.cpp OpenTTD-1.9.1.mod/src/3rdparty/squirrel/squirrel/sqvm.cpp
|
||
|
|
--- OpenTTD-1.9.1/src/3rdparty/squirrel/squirrel/sqvm.cpp 2019-04-08 22:37:59.000000000 +0300
|
||
|
|
+++ OpenTTD-1.9.1.mod/src/3rdparty/squirrel/squirrel/sqvm.cpp 2019-06-30 00:08:31.019272864 +0300
|
||
|
|
@@ -6,7 +6,10 @@
|
||
|
|
|
||
|
|
#include <squirrel.h>
|
||
|
|
#include "sqpcheader.h"
|
||
|
|
+#pragma push_macro("type")
|
||
|
|
+#undef type
|
||
|
|
#include <math.h>
|
||
|
|
+#pragma pop_macro("type")
|
||
|
|
#include "sqopcodes.h"
|
||
|
|
#include "sqfuncproto.h"
|
||
|
|
#include "sqvm.h"
|