  #if defined(__APPLE__)
  	#include "os/macosx/osx_stdafx.h"
  #endif /* __APPLE__ */
-diff -ruwN source/src/string.cpp source-new/src/string.cpp
---- source/src/string.cpp	2018-12-29 07:28:59.207297436 -0700
-+++ source-new/src/string.cpp	2018-12-29 10:11:42.314241804 -0700
-@@ -528,7 +528,7 @@
+diff -rupNw source/src/string.cpp source-new/src/string.cpp
+--- source/src/string.cpp	2019-03-04 21:01:49.955057370 +0100
++++ source-new/src/string.cpp	2019-03-04 21:00:15.938317862 +0100
+@@ -528,7 +528,7 @@ size_t Utf8TrimString(char *s, size_t ma
  	return length;
  }
  

diff -ruwN source/config.lib source-new/config.lib
--- source/config.lib	2018-12-29 07:28:58.975290421 -0700
+++ source-new/config.lib	2019-01-06 17:30:43.830146522 -0700
@@ -1486,7 +1486,7 @@
 	# Special CXXFlags for HOST
 	CXXFLAGS="$CXXFLAGS"
 	# Libs to compile. In fact this is just LDFLAGS

 
 /**
  * The NewGRF revision of OTTD:
diff -rupNw source/src/stdafx.h source-new/src/stdafx.h
--- source/src/stdafx.h	2019-03-04 21:01:49.955057370 +0100
+++ source-new/src/stdafx.h	2019-03-04 21:00:15.930317800 +0100
@@ -12,6 +12,9 @@
 #ifndef STDAFX_H
 #define STDAFX_H
