From: mquinson Date: Fri, 17 Dec 2010 19:54:40 +0000 (+0000) Subject: fix a linking error in libgras. At least I hope since another issue prevents me from... X-Git-Tag: v3.6_beta2~633 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/27d566aff751aa91bc650bf1ea2f92d7cd5a7d52?hp=918f374c626b2c4f4481d7d5d9c4b0dfbc94ef43 fix a linking error in libgras. At least I hope since another issue prevents me from even compiling... git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9292 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- diff --git a/src/surf/surf_config.c b/src/surf/surf_config.c index e0e687b6e5..e54c58df8e 100644 --- a/src/surf/surf_config.c +++ b/src/surf/surf_config.c @@ -179,7 +179,7 @@ static void _surf_cfg_cb__surf_path(const char *name, int pos) /* callback to decide if we want to use the model-checking */ #include "xbt_modinter.h" -int _surf_do_model_check = 0; /* this variable is used accros the lib */ +extern int _surf_do_model_check; /* this variable lives in xbt_main until I find a right location for it */ static void _surf_cfg_cb_model_check(const char *name, int pos) { diff --git a/src/xbt/xbt_main.c b/src/xbt/xbt_main.c index a3530c3b66..65add45af5 100644 --- a/src/xbt/xbt_main.c +++ b/src/xbt/xbt_main.c @@ -49,6 +49,7 @@ XBT_LOG_EXTERNAL_CATEGORY(xbt_sync_os); XBT_LOG_EXTERNAL_CATEGORY(xbt_parmap); XBT_LOG_EXTERNAL_CATEGORY(xbt_parmap_unit); +int _surf_do_model_check = 0; /* this variable is used accros the libraries, and must be declared in XBT so that it's also defined in GRAS (not only in libsimgrid) */ /* Declare xbt_preinit and xbt_postexit as constructor/destructor of the library. * This is crude and rather compiler-specific, unfortunately.