Define smx_current_context only once to make the linker happy

[simgrid.git] / include / simix / context.h

diff --git a/include/simix/context.h b/include/simix/context.h
index 475ffbc..0ccf120 100644 (file)
--- a/include/simix/context.h
+++ b/include/simix/context.h
@@ -51,12 +51,12 @@ typedef struct s_smx_context_factory {
 
 
 
-/*Hack: let msg load directly the right factory */
-typedef void (*SIMIX_ctx_factory_initializer_t)(smx_context_factory_t*);
-extern SIMIX_ctx_factory_initializer_t factory_initializer_to_use;
-
-extern int _surf_parallel_contexts;
-smx_context_t smx_current_context;
+/* Hack: let msg load directly the right factory */
+typedef void (*smx_ctx_factory_initializer_t)(smx_context_factory_t*);
+extern smx_ctx_factory_initializer_t smx_factory_initializer_to_use;
+extern char* smx_context_factory_name;
+extern int smx_parallel_contexts;
+extern smx_context_t smx_current_context;
 
 /* *********************** */
 /* Context type definition */