[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit bb15c601c617ca2b3a245029f9cb16b6ba4799d2
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Tue Sep 6 16:11:01 2005 +1000

    @ is replaced with # before compiling functions
    
    Lines starting with # are treated as comments and ignored, which is a
    problem if precompiler directives are used in the function. Using @
    instead of # allows the use of precompiler directives.
    
    darcs-hash:20050906061101-fbd8f-5317ddcef53b61ac91d53510ee0547f9e498c256.gz

diff --git a/src/utils.c b/src/utils.c
index 9549735..4068f96 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -265,7 +265,8 @@ static gint compile (GtsFile * fp, GfsFunction * f, const gchar * finname)
   cc = g_strjoin (" ",
 		  cccommand, ftmpname, 
 		  "-o", foutname,
-		  "`awk '{"
+                  "`sed 's/@/#/g' <", finname,
+		  "| awk '{"
 		  "   if ($1 == \"#\" && $2 == \"link\") {"
 		  "     for (i = 3; i <= NF; i++) printf (\"%s \", $i);"
 		  "     print \"\" > \"/dev/stderr\";"
@@ -274,7 +275,7 @@ static gint compile (GtsFile * fp, GfsFunction * f, const gchar * finname)
 		  "     for (i = 2; i <= NF; i++) printf (\"%s \", $i);"
 		  "     print \"\" > \"/dev/stderr\";"
 		  "   } else print $0 > \"/dev/stderr\";"
-		  "}' <", finname, "2>", ftmpname, "` 2>",
+		  "}' 2>", ftmpname, "` 2>",
 		  ferrname, NULL);
   status = system (cc);
   g_free (cc);

-- 
Gerris Flow Solver