From b03c4669c65ee144f7e3c86c9b6748d0c831931c Mon Sep 17 00:00:00 2001 From: cherierm Date: Tue, 13 Mar 2007 12:35:12 +0000 Subject: [PATCH] special exportation data for visual c++ git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@3255 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/include/surf/surf.h | 14 +++++++------- src/surf/surf.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h index 3b510f2df7..45499ebc5d 100644 --- a/src/include/surf/surf.h +++ b/src/include/surf/surf.h @@ -163,7 +163,7 @@ typedef struct surf_timer_resource { /** \brief The timer resource * \ingroup SURF_resources */ -XBT_PUBLIC(surf_timer_resource_t) surf_timer_resource; +extern surf_timer_resource_t XBT_DECLARE_DATA surf_timer_resource; /** \brief Initializes the timer resource * \ingroup SURF_resources @@ -206,7 +206,7 @@ typedef struct surf_cpu_resource { /** \brief The CPU resource * \ingroup SURF_resources */ -XBT_PUBLIC(surf_cpu_resource_t) surf_cpu_resource; +extern surf_cpu_resource_t XBT_DECLARE_DATA surf_cpu_resource; /** \brief Initializes the CPU resource with the model Cas01 * \ingroup SURF_resources @@ -253,7 +253,7 @@ typedef struct surf_network_resource { * resource should be accessed because depending on the platform model, * the network resource can be NULL. */ -XBT_PUBLIC(surf_network_resource_t) surf_network_resource; +extern surf_network_resource_t XBT_DECLARE_DATA surf_network_resource; /** \brief Initializes the platform with the network model CM02 * \ingroup SURF_resources @@ -313,7 +313,7 @@ typedef struct surf_workstation_resource { * because depending on the platform model, the network resource and the CPU resource * may not exist. */ -XBT_PUBLIC(surf_workstation_resource_t) surf_workstation_resource; +extern surf_workstation_resource_t XBT_DECLARE_DATA surf_workstation_resource; /** \brief Initializes the platform with the workstation model CLM03 * \ingroup SURF_resources @@ -353,7 +353,7 @@ XBT_PUBLIC(void) surf_workstation_resource_init_KCCFLN05_proportionnal(const cha * * \see workstation_set */ -XBT_PUBLIC(xbt_dict_t) network_link_set; +extern xbt_dict_t XBT_DECLARE_DATA network_link_set; /** \brief The workstations * \ingroup SURF_resources @@ -362,12 +362,12 @@ XBT_PUBLIC(xbt_dict_t) network_link_set; * * \see network_link_set */ -XBT_PUBLIC(xbt_dict_t) workstation_set; +extern xbt_dict_t XBT_DECLARE_DATA workstation_set; /** \brief List of initialized resources * \ingroup SURF_resources */ -XBT_PUBLIC(xbt_dynar_t) resource_list; +extern xbt_dynar_t XBT_DECLARE_DATA resource_list; /*******************************************/ /*** SURF Globals **************************/ diff --git a/src/surf/surf.c b/src/surf/surf.c index f4eac311f0..ced29d3bed 100644 --- a/src/surf/surf.c +++ b/src/surf/surf.c @@ -111,7 +111,7 @@ typedef struct surf_resource_object { static double NOW = 0; -xbt_dynar_t resource_list = NULL; +xbt_dynar_t XBT_DECLARE_DATA resource_list = NULL; tmgr_history_t history = NULL; lmm_system_t maxmin_system = NULL; xbt_dynar_t surf_path = NULL; -- 2.20.1