From 6ba71707f290e77a0fb3414aadb7e9e39636cdfd Mon Sep 17 00:00:00 2001 From: rubidium Date: Sat, 14 Jul 2007 20:40:11 +0000 Subject: [PATCH] (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). --- Makefile.src.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile.src.in b/Makefile.src.in index 907ce1881d..2d3a5205ce 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