Merge back master branch

[simgrid.git] / tools / gras / gras_stub_generator.h

diff --git a/tools/gras/gras_stub_generator.h b/tools/gras/gras_stub_generator.h
index 01c6688..e50590f 100644 (file)
--- a/tools/gras/gras_stub_generator.h
+++ b/tools/gras/gras_stub_generator.h
@@ -15,16 +15,16 @@
 
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
-xbt_dict_t process_function_set;
-xbt_dynar_t process_list;
-xbt_dict_t machine_set;
+extern xbt_dict_t process_function_set;
+extern xbt_dynar_t process_list;
+extern xbt_dict_t machine_set;
+extern char *warning;
 
 typedef struct s_process_t {
   int argc;
   char **argv;
   char *host;
 } s_process_t;
-char *warning;
 
 void s_process_free(void *process);
 
@@ -35,34 +35,30 @@ void generate_makefile_am(char *project, char *deployment);
 void generate_makefile_local(char *project, char *deployment);
 
 /* the gras.h header directory (used only in windows)*/
-extern char* __gras_path;
+extern char *__gras_path;
 
 /*
  * Generate a borland simulation poject file.
  * @param name The name of the simulation project
  */
-void
-generate_borland_simulation_project(const char* name);
+void generate_borland_simulation_project(const char *name);
 
 /*
  * Generate a borland project file for real life.
  * @param name The name of the project to create.
  */
-void
-generate_borland_real_life_project(const char* name);
+void generate_borland_real_life_project(const char *name);
 
 
 /*
  * Create the Microsoft visual C++ file project for the simulation.
  */
-int
-generate_simulation_dsp_file(const char* project_name);
+int generate_simulation_dsp_file(const char *project_name);
 
 /*
  * Create the Microsoft visual C++ real life project file.
  */
-int
-generate_real_live_dsp_file(const char* project_name);
+int generate_real_live_dsp_file(const char *project_name);
 
 
 #endif