[SCM] transportation simulator branch, master, updated. debian/110.0.1-3

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit e19c9e8e03e78800c7d16463ec3cfb37073def45
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Thu May 5 22:08:22 2011 +0200

    Fix compiling with gcc-4.6.
    
    Bug-Debian: http://bugs.debian.org/625058

diff --git a/debian/patches/0001-jspaces-fix-compiling-with-gcc-4.6.0.patch b/debian/patches/0001-jspaces-fix-compiling-with-gcc-4.6.0.patch
new file mode 100644
index 0000000..b675d46
--- /dev/null
+++ b/debian/patches/0001-jspaces-fix-compiling-with-gcc-4.6.0.patch
@@ -0,0 +1,20 @@
+From: Dwachs <dwachs at gmx.net>
+Date: Mon, 25 Apr 2011 08:18:59 +0000
+Subject: [PATCH] (jspaces) fix compiling with gcc 4.6.0
+Bug-Debian: http://bugs.debian.org/625058
+
+git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@4416 8aca7d54-2c30-db11-9de9-000461428c89
+---
+ tpl/slist_tpl.h |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+--- simutrans.orig/tpl/slist_tpl.h
++++ simutrans/tpl/slist_tpl.h
+@@ -12,6 +12,7 @@
+ #include <typeinfo>
+ #include "../dataobj/freelist.h"
+ #include "../simdebug.h"
++#include <stddef.h> // for ptrdiff_t
+ 
+ #ifdef _MSC_VER
+ #pragma warning(disable:4786)
diff --git a/debian/patches/series b/debian/patches/series
index 3dc04ba..14cd4d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ link-less-libraries.diff
 0001-neroden-give-IMG_LEER-type-image_id.patch
 0002-FIX-loading-of-savegames-with-line-with-id-0.patch
 0003-Updated-history.txt.patch
+0001-jspaces-fix-compiling-with-gcc-4.6.0.patch

-- 
transportation simulator