X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0f5e8daaa6e9f74521068aa75837200bcd182ea6..307483ac1553316bf842eddd87031a3d6da30c2b:/src/bindings/lua/lua_stub_generator.c

diff --git a/src/bindings/lua/lua_stub_generator.c b/src/bindings/lua/lua_stub_generator.c
index 585576790e..87e2c8ce2a 100644
--- a/src/bindings/lua/lua_stub_generator.c
+++ b/src/bindings/lua/lua_stub_generator.c
@@ -6,21 +6,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "lua_stub_generator.h"
-
-#include <stdio.h>
-#include "xbt/sysdep.h"
-#include "xbt/function_types.h"
-#include "xbt/log.h"
-#include "surf/surfxml_parse.h"
-#include "surf/surf.h"
-#include "portable.h"           /* Needed for the time of the SIMIX convertion */
-#include <stdarg.h>
-
-#include <lua.h>
-#include <lauxlib.h>
-#include <lualib.h>
-
+#include "simgrid_lua.h"
 
 #define WARN "/***********\n * DO NOT EDIT! THIS FILE HAS BEEN AUTOMATICALLY GENERATED FROM %s BY gras_stub_generator\n ***********/\n"
 #define SIM_SOURCENAME  "_%s_simulator.c"
@@ -38,8 +24,6 @@
 #define MAKEFILE_FILENAME_REMOTE  "%s.Makefile.remote"
 #define DEPLOYMENT  "%s.deploy.sh"
 
-char *warning = NULL;
-
 /**********************************************/
 /**** Generate the file for the simulator *****/
 /**********************************************/
@@ -104,7 +88,7 @@ void generate_sim(const char *project)
 
   OUT = fopen(filename, "w");
 
-  xbt_assert1(OUT, "Unable to open %s for writing", filename);
+  xbt_assert(OUT, "Unable to open %s for writing", filename);
 
   fprintf(OUT, "%s", SIM_PREEMBULE);
 
@@ -163,7 +147,7 @@ void generate_rl(const char *project)
     sprintf(filename, RL_SOURCENAME, project, key);
 
     OUT = fopen(filename, "w");
-    xbt_assert1(OUT, "Unable to open %s for writing", filename);
+    xbt_assert(OUT, "Unable to open %s for writing", filename);
 
     fprintf(OUT, "/* specific to Borland Compiler */\n"
             "#ifdef __BORLANDC__\n"
@@ -204,7 +188,7 @@ void generate_makefile_am(const char *project)
   sprintf(filename, MAKEFILE_FILENAME_AM, project);
 
   OUT = fopen(filename, "w");
-  xbt_assert1(OUT, "Unable to open %s for writing", filename);
+  xbt_assert(OUT, "Unable to open %s for writing", filename);
 
   fprintf(OUT, "# AUTOMAKE variable definition\n");
   fprintf(OUT, "INCLUDES= @CFLAGS_SimGrid@\n\n");
@@ -270,7 +254,7 @@ void generate_makefile_local(const char *project)
   sprintf(filename, MAKEFILE_FILENAME_LOCAL, project);
 
   OUT = fopen(filename, "w");
-  xbt_assert1(OUT, "Unable to open %s for writing", filename);
+  xbt_assert(OUT, "Unable to open %s for writing", filename);
   free(filename);
 
   fprintf(OUT,