Integration of Chaco into Gmsh

contrib/Chaco/misc/countup_mesh.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include <stdio.h>
+#include "Gmsh_printf.h"
 #include "defs.h"
 #include "structs.h"
 

contrib/Chaco/misc/sequence.c

@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 #include <string.h>
+#include "Gmsh_printf.h"
 #include "params.h"
 #include "defs.h"
 #include "structs.h"

contrib/Chaco/misc/simple_part.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include	<stdio.h>
+#include        "Gmsh_printf.h"
 #include	"structs.h"
 #include	"defs.h"
 #include	"params.h"

contrib/Chaco/misc/time_kernels.c

@@ -4,6 +4,7 @@
 
 #include	<stdio.h>
 #include	<math.h>
+#include        "Gmsh_printf.h"
 #include	"defs.h"
 #include	"structs.h"
 

contrib/Chaco/optimize/opt2d.c

@@ -4,6 +4,7 @@
 
 #include	<stdio.h>
 #include	<math.h>
+#include        "Gmsh_printf.h"
 #include	"defs.h"
 #include	"structs.h"
 

contrib/Chaco/optimize/opt3d.c

@@ -4,6 +4,7 @@
 
 #include	<stdio.h>
 #include	<math.h>
+#include        "Gmsh_printf.h"
 #include	"structs.h"
 #include	"defs.h"
 

contrib/Chaco/submain/balance.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include <stdio.h>
+#include "Gmsh_printf.h"
 #include "params.h"
 #include "defs.h"
 #include "structs.h"

contrib/Chaco/submain/divide.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include <stdio.h>
+#include "Gmsh_printf.h"
 #include "params.h"
 #include "defs.h"
 #include "structs.h"

contrib/Chaco/submain/submain.c

@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <math.h>
+#include "Gmsh_printf.h"
 #include "defs.h"
 #include "params.h"
 #include "structs.h"

contrib/Chaco/util/affirm.c

@@ -5,6 +5,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
+#include "Gmsh_printf.h"
 #include "defs.h"
 
 /* Record a return TRUE if answer is yes, FALSE if no. */

contrib/Chaco/util/bail.c

@@ -4,6 +4,8 @@
 
 #include	<stdio.h>
 #include	<string.h>
+#include        "Gmsh_printf.h"
+#include        "Gmsh_exit.h"
 
 /* Wrapper for exit() - print message and exit with status code. Exit code
    of 0 indicates normal termination. Exit code of 1 indicates early 
@@ -22,5 +24,6 @@ int       status;
             fprintf(Output_File, "%s\n", msg);
 	}
     }
-    exit(status);
+/*     exit(status); */
+    Gmsh_exit();
 }

contrib/Chaco/util/checkpnt.c

@@ -4,6 +4,7 @@
 
 #include	<stdio.h>
 #include	<string.h>
+#include        "Gmsh_printf.h"
 
 /* Debug break point. */
 void      checkpnt(tag)

contrib/Chaco/util/doubleout.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include  <stdio.h>
+#include  "Gmsh_printf.h"
 
 /* Print a double precision number with filtering format to screen. */
 void      doubleout(number, mode)

contrib/Chaco/util/mergesort.c

@@ -3,6 +3,7 @@
  * contract DE-AC04-76DP00789 and is copyrighted by Sandia Corporation. */
 
 #include	<stdio.h>
+#include        "Gmsh_printf.h"
 #include	"defs.h"
 
 

contrib/Chaco/util/smalloc.c

@@ -4,6 +4,7 @@
 
 #include <stdio.h>
 #include <malloc.h>
+#include "Gmsh_printf.h"
 
 static int nmalloc = 0;		/* number of calls to malloc */
 static int nfree = 0;		/* number of calls to free */

contrib/Chaco/util/strout.c

@@ -4,6 +4,7 @@
 
 #include	<stdio.h>
 #include	<string.h>
+#include        "Gmsh_printf.h"
 
 /* Wrapper for a printf statement with a string as only arg.
    Prints to screen and to output file if there is one. */