File openttd-gcc5.patch of Package openttd
Index: openttd-1.5.3/config.lib
===================================================================
--- openttd-1.5.3.orig/config.lib
+++ openttd-1.5.3/config.lib
@@ -1317,7 +1317,11 @@ make_compiler_cflags() {
ldflags="$ldflags -rdynamic"
else
# Enable some things only for certain GCC versions
- cc_version=`$1 -dumpversion | cut -c 1,3`
+ cc_version=`$1 -dumpversion | cut -c 1,3`
+ if [ $cc_version -ge 5 ]; then
+ # Special case: GCC 5.0 reports only '5'
+ cc_version=50
+ fi
if [ $cc_version -lt 33 ]; then
log 1 "configure: error: gcc older than 3.3 can't compile OpenTTD because of its poor template support"
Index: openttd-1.5.3/src/safeguards.h
===================================================================
--- openttd-1.5.3.orig/src/safeguards.h
+++ openttd-1.5.3/src/safeguards.h
@@ -21,6 +21,8 @@
#ifndef SAFEGUARDS_H
#define SAFEGUARDS_H
+#include <stdlib.h>
+
/* Use MallocT instead. */
#define malloc SAFEGUARD_DO_NOT_USE_THIS_METHOD