From 61fed57c73a9a8841d534d11180dd2923bc17c83 Mon Sep 17 00:00:00 2001 From: jcej Date: Wed, 24 Feb 1999 22:36:09 +0000 Subject: *** empty log message *** --- docs/tutorials/combine | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) (limited to 'docs/tutorials/combine') diff --git a/docs/tutorials/combine b/docs/tutorials/combine index 7d29dab60d4..c464f389e00 100755 --- a/docs/tutorials/combine +++ b/docs/tutorials/combine @@ -143,13 +143,20 @@ sub addFile { while( ) { s/\#$1$2$3,; - s,\#(include|endif),$&,; - s,"([^"]+)","$1",g; - s,//.*$,$&,; - s,/\*,$&,; - s,\*/,$&,; - s,\w+::\~?\w+,$&,; + if( m,include\s+"ace/.*\.h", ) { + s,(ace/.*\.h),$1,; + s,\#\s*include,$&,; + } + else + { + s,\#(\s*)(e?l?if !?defined|pragma|ifn?def|define)(\W*)([\w\.]+),\#$1$2$3$4,; + s,\#\s*(include|endif),$&,; + s,"([^"]+)","$1",g; + s,//.*$,$&,; + s,/\*,$&,; + s,\*/,$&,; + s,\w+::\~?\w+,$&,; + } print FILE $_; } print FILE "\n"; -- cgit v1.2.1