summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-07-14 20:40:11 +0000
committerrubidium <rubidium@openttd.org>2007-07-14 20:40:11 +0000
commit6ba71707f290e77a0fb3414aadb7e9e39636cdfd (patch)
treef410a14ea2b1c6072f38d0614a4dedcace88fdf6
parentb8e302d2a08fe8775a459ff123fabd2565a50238 (diff)
downloadopenttd-6ba71707f290e77a0fb3414aadb7e9e39636cdfd.tar.xz
(svn r10563) -Fix: gcc 2.95 (which is still needed for MorphOS :() does have trouble with using the protected/private variables of the enclosing class (and super classes of that enclosing class).
-rw-r--r--Makefile.src.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/Makefile.src.in b/Makefile.src.in
index 907ce1881..2d3a5205c 100644
--- a/Makefile.src.in
+++ b/Makefile.src.in
@@ -61,7 +61,10 @@ GCC295_FIX=sed -r 's/^(\t*)(.*)( const )([A-Za-z0-9_ ]+(\[.*\]){2,})(( = \{)|(;)
# gcc 2.95.3 and lower, as it should indicate that it is a C-linkage, but the
# compiler can't handle that information (just don't ask). So we remove it
# and then it compiles happily and without bitching :)
-GCC295_FIX_2=sed -e 's|\(^\# [0-9][0-9]* "[^"]*"[ 0-9]*\) 4$$|\1|g'
+# Furthermore gcc 2.95 has some trouble with protected and private when
+# accessing the protected/private stuff of the enclosing class (or the
+# super class of the enclosing class).
+GCC295_FIX_2=sed -e 's|\(^\# [0-9][0-9]* "[^"]*"[ 0-9]*\) 4$$|\1|g;s|private:|public:|g;s|protected:|public:|g'
# Check if we want to show what we are doing
ifdef VERBOSE