From: thiery <thiery@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 10 Jan 2011 14:09:28 +0000 (+0000)
Subject: Define smx_current_context only once to make the linker happy
X-Git-Tag: v3.6_beta2~538
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/8a24d575ab0a1d565521896081c6d5e0f1dfb941

Define smx_current_context only once to make the linker happy

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9390 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/include/simix/context.h b/include/simix/context.h
index 6c62065011..0ccf120727 100644
--- a/include/simix/context.h
+++ b/include/simix/context.h
@@ -56,7 +56,7 @@ 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;
-smx_context_t smx_current_context;
+extern smx_context_t smx_current_context;
 
 /* *********************** */
 /* Context type definition */
diff --git a/src/simix/smx_context.c b/src/simix/smx_context.c
index 56abb11a8e..1044a01ec2 100644
--- a/src/simix/smx_context.c
+++ b/src/simix/smx_context.c
@@ -17,6 +17,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_context, simix,
 
 char* smx_context_factory_name = NULL; /* factory name specified by --cfg=simix/context=value */
 smx_ctx_factory_initializer_t smx_factory_initializer_to_use = NULL;
+smx_context_t smx_current_context;
 
 /** 
  * This function is called by SIMIX_global_init() to initialize the context module.