From 3917f89474931cf825dd53e6bf00665992b9049b Mon Sep 17 00:00:00 2001 From: rmanfredi Date: Mon, 13 Aug 2007 12:14:08 +0000 Subject: Linux does not like ^M as line endings: cpp 4.1.x complains. Try with ^A, hoping it will continue to work on HP-UX. git-svn-id: https://dist.svn.sourceforge.net/svnroot/dist/trunk/dist@19 190e5f8e-a817-0410-acf6-e9863daed9af --- jmake/fixcpp.SH | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'jmake') diff --git a/jmake/fixcpp.SH b/jmake/fixcpp.SH index 24dd274..4bbc69b 100755 --- a/jmake/fixcpp.SH +++ b/jmake/fixcpp.SH @@ -43,7 +43,7 @@ $startperl # This program is meant to be called from jmake. All it does is pre-process # the file it is given as argument, focusing on #include directives and # resolving them as cpp would (but without the #line stuff since we don't -# really care about it), escaping all the trailing \ into '\ ^M'. The resulting +# really care about it), escaping all the trailing \ into '\ ^A'. The resulting # temporary file is then handed off to the real cpp for macro processing, and # the output is printed on stdout, after restoration of any original trailing \. # Again, thanks HP-UX for making this so challenging and exciting... :-) @@ -135,7 +135,7 @@ sub escape { # Don't escape trailing backslashes in macro definition or cpp # won't see them as macro continuation any longer, and also within # macro definitions, all those @@ or @! continuations... - s/\\$/\\ \015/ unless /\@[!@]\\$/ || /^#define/; + s/\\$/\\ \001/ unless /\@[!@]\\$/ || /^#define/; } # Append file to given (opened) file descriptor @@ -172,7 +172,7 @@ sub cpp { local($file) = @_; open(CPP, "$cpp $cpp_opt $file |") || die "Can't fork: $!\n"; while () { - s/\\ \015$/\\/; # Un-escape trailing \ + s/\\ \001$/\\/; # Un-escape trailing \ print STDOUT; } close CPP; -- cgit v1.2.3