From d0e028b4d4f388d57421fc5d0f9ffa2e847cab98 Mon Sep 17 00:00:00 2001 From: mquinson Date: Tue, 4 Dec 2007 15:55:13 +0000 Subject: [PATCH] Mac users need love so that their prehistoric linker don't get messed up with multiple definitions of the globals git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5105 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/include/surf/surf.h | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index ac5da2b53a..a4623ed4fa 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -569,15 +569,18 @@ void parse_trace_finalize(void); void parse_trace_c_connect(void); void manage_route(xbt_dict_t route_table, const char* route_name, int action, int isMultiRoute); -int route_action; +XBT_PUBLIC_DATA(int) route_action; /* This is used by all models when creating the routing table while parsing */ -xbt_dict_t route_table, route_multi_table; -xbt_dynar_t route_link_list; +XBT_PUBLIC_DATA(xbt_dict_t) route_table; +XBT_PUBLIC_DATA(xbt_dict_t) route_multi_table; +XBT_PUBLIC_DATA(xbt_dict_t) route_table; +XBT_PUBLIC_DATA(xbt_dict_t) route_multi_table; +XBT_PUBLIC_DATA(xbt_dynar_t) route_link_list; /* For the trace and trace:connect tag */ -xbt_dict_t traces_set_list; -xbt_dynar_t traces_connect_list; +XBT_PUBLIC_DATA(xbt_dict_t) traces_set_list; +XBT_PUBLIC_DATA(xbt_dynar_t) traces_connect_list; double get_cpu_power(const char* power); void init_randomness(void); -- 2.20.1