[SCM] transportation simulator branch, master, updated. upstream/100.0-31-gee400ca

[Ansgar Burchardt]

The following commit has been merged in the master branch:
commit 9168142d0c3518b6c7aca80ae14a95ccd9c27671
Author: Ansgar Burchardt <ansgar at 2008.43-1.org>
Date:   Mon Aug 18 20:10:11 2008 +0200

    Use <endian.h> header to detect endianness (thanks to Peter de Wachter)

diff --git a/debian/changelog b/debian/changelog
index bf4bbbc..a8bfd3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+simutrans (100.0+ds1-3) UNRELEASED; urgency=low
+
+  * Use <endian.h> header to detect endianness (thanks to Peter de Wachter)
+
+ -- Ansgar Burchardt <ansgar at 43-1.org>  Mon, 18 Aug 2008 20:07:36 +0200
+
 simutrans (100.0+ds1-2) unstable; urgency=low
 
   * Remove cast from `const char*' to `int' in simconvoi.cc
diff --git a/debian/patches/config.diff b/debian/patches/config.diff
index cec4339..c10b4ab 100644
--- a/debian/patches/config.diff
+++ b/debian/patches/config.diff
@@ -2,8 +2,6 @@ Build configuration for Debian
 
 @DPATCH@
 
-Index: simutrans/makeobj/Makefile
-===================================================================
 --- simutrans.orig/makeobj/Makefile
 +++ simutrans/makeobj/Makefile
 @@ -2,8 +2,8 @@
@@ -39,11 +37,9 @@ Index: simutrans/makeobj/Makefile
  
  clean:
  	rm -f $(OBJECTS)
-Index: simutrans/config.default
-===================================================================
 --- /dev/null
 +++ simutrans/config.default
-@@ -0,0 +1,65 @@
+@@ -0,0 +1,60 @@
 +#
 +# to compile:
 +# copy this file to config.default and adjust the settings
@@ -104,13 +100,6 @@ Index: simutrans/config.default
 +  FLAGS += -DUSE_C
 +endif
 +
-+# TODO: not very elegant...
-+ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),powerpc)
-+  FLAGS += -DBIG_ENDIAN
-+endif
-+
-Index: simutrans/Makefile
-===================================================================
 --- simutrans.orig/Makefile
 +++ simutrans/Makefile
 @@ -57,27 +57,27 @@
@@ -159,3 +148,19 @@ Index: simutrans/Makefile
    endif
    ifeq ($(shell expr $(DEBUG) \>= 2), 1)
      CFLAGS   += -fno-inline
+--- simutrans.orig/simtypes.h
++++ simutrans/simtypes.h
+@@ -8,6 +8,13 @@
+ #ifndef SIMTYPES_H
+ #define SIMTYPES_H
+ 
++#include <endian.h>
++#undef LITTLE_ENDIAN //endian.h gives these definitions we don't want
++#undef BIG_ENDIAN
++#if __BYTE_ORDER == __BIG_ENDIAN
++	#define BIG_ENDIAN
++#endif
++
+ #if defined _MSC_VER
+ #	if _MSC_VER <= 1200
+ #		error "Simutrans cannot be compiled with Visual C++ 6.0 or earlier."

-- 
transportation simulator