From 24063de5862770cae9c164f63cc511d5deb1a759 Mon Sep 17 00:00:00 2001
From: smatz <smatz@openttd.org>
Date: Wed, 24 Aug 2011 18:21:54 +0000
Subject: [PATCH] (svn r22832) -Codechange: add -Wno-free-nonheap-object to
 CFLAGS in order to prevent some invalid GCC warnings

---
 config.lib | 2 ++
 readme.txt | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config.lib b/config.lib
index 523b6104cd..2c7e0ff780 100644
--- a/config.lib
+++ b/config.lib
@@ -1304,6 +1304,8 @@ make_compiler_cflags() {
 			# warning: narrowing conversion of '...' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
 			# They are valid according to the C++ standard, but useless.
 			cxxflags="$cxxflags -Wno-narrowing"
+			# Disable bogus 'attempt to free a non-heap object' warning
+			flags="$flags -Wno-free-nonheap-object"
 		fi
 
 		if [ "$enable_lto" != "0" ]; then
diff --git a/readme.txt b/readme.txt
index a7a8f32ac8..16a047f505 100644
--- a/readme.txt
+++ b/readme.txt
@@ -470,7 +470,7 @@ The following compilers are known to compile OpenTTD:
     Version 2005 gives bogus warnings about scoping issues.
   - GNU Compiler Collection (GCC) 3.3 - 4.7.
     Versions 4.1 and earlier give bogus warnings about uninitialised variables.
-    Versions 4.4 and later give bogus warnings about freeing non-heap objects.
+    Versions 4.4 - 4.6 give bogus warnings about freeing non-heap objects.
     Versions 4.5 and later give invalid warnings when lto is enabled.
   - Intel C++ Compiler (ICC) 12.0.