Index: branches/2018Q1/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp
===================================================================
--- branches/2018Q1/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp	(nonexistent)
+++ branches/2018Q1/games/aquaria/files/patch-Aquaria_ScriptInterface.cpp	(revision 458225)
@@ -0,0 +1,15 @@
+Aquaria/ScriptInterface.cpp:10412:59: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
+#define MK_ALIAS(prefix, suffix, alias) {MK_STR(prefix)"_"MK_STR(alias), l_##prefix##_##suffix},
+                                                          ^
+
+--- Aquaria/ScriptInterface.cpp.orig	2016-06-19 23:56:27 UTC
++++ Aquaria/ScriptInterface.cpp
+@@ -10409,7 +10409,7 @@ static const struct {
+ #undef MK_ALIAS
+ #define MK_FUNC(base, getter, prefix, suffix) luaRegister(prefix##_##suffix),
+ #define MK_STR(s) #s
+-#define MK_ALIAS(prefix, suffix, alias) {MK_STR(prefix)"_"MK_STR(alias), l_##prefix##_##suffix},
++#define MK_ALIAS(prefix, suffix, alias) {MK_STR(prefix) "_" MK_STR(alias), l_##prefix##_##suffix},
+ 
+ 	EXPAND_FUNC_PROTOTYPES
+ 

Property changes on: branches/2018Q1/games/aquaria/files/patch-Aquaria_ScriptInterface.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/2018Q1
===================================================================
--- branches/2018Q1	(revision 458224)
+++ branches/2018Q1	(revision 458225)

Property changes on: branches/2018Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r458223