effect of the redefinition of the macro XBT_PUBLIC_DATA

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

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 2eb03a2..da002e0 100644 (file)
--- 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
  */
 /** \brief The timer resource
  *  \ingroup SURF_resources
  */

-XBT_PUBLIC_DATA(surf_timer_resource_t) surf_timer_resource;
+extern surf_timer_resource_t XBT_PUBLIC_DATA surf_timer_resource;

 
 /** \brief Initializes the timer resource
  *  \ingroup SURF_resources
 
 /** \brief Initializes the timer resource
  *  \ingroup SURF_resources


@@ -206,7 +206,7 @@ typedef struct surf_cpu_resource {
 /** \brief The CPU resource
  *  \ingroup SURF_resources
  */
 /** \brief The CPU resource
  *  \ingroup SURF_resources
  */

-XBT_PUBLIC_DATA(surf_cpu_resource_t) surf_cpu_resource;
+extern surf_cpu_resource_t XBT_PUBLIC_DATA surf_cpu_resource;

 
 /** \brief Initializes the CPU resource with the model Cas01
  *  \ingroup SURF_resources
 
 /** \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.
  */
  *  resource should be accessed because depending on the platform model,
  *  the network resource can be NULL.
  */

-XBT_PUBLIC_DATA(surf_network_resource_t) surf_network_resource;
+extern surf_network_resource_t XBT_PUBLIC_DATA surf_network_resource;

 
 /** \brief Initializes the platform with the network model CM02
  *  \ingroup SURF_resources
 
 /** \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.
  */
  *  because depending on the platform model, the network resource and the CPU resource
  *  may not exist.
  */

-XBT_PUBLIC_DATA(surf_workstation_resource_t) surf_workstation_resource;
+extern surf_workstation_resource_t XBT_PUBLIC_DATA surf_workstation_resource;

 
 /** \brief Initializes the platform with the workstation model CLM03
  *  \ingroup SURF_resources
 
 /** \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
  */
  *
  *  \see workstation_set
  */

-XBT_PUBLIC_DATA(xbt_dict_t) network_link_set;
+extern xbt_dict_t XBT_PUBLIC_DATA network_link_set;

 
 /** \brief The workstations
  *  \ingroup SURF_resources
 
 /** \brief The workstations
  *  \ingroup SURF_resources


@@ -362,12 +362,12 @@ XBT_PUBLIC_DATA(xbt_dict_t) network_link_set;
  *
  *  \see network_link_set
  */
  *
  *  \see network_link_set
  */

-XBT_PUBLIC_DATA(xbt_dict_t) workstation_set;
+extern xbt_dict_t XBT_PUBLIC_DATA workstation_set;

 
 /** \brief List of initialized resources
  *  \ingroup SURF_resources
  */
 
 /** \brief List of initialized resources
  *  \ingroup SURF_resources
  */

-XBT_PUBLIC_DATA(xbt_dynar_t) resource_list;
+extern xbt_dynar_t XBT_PUBLIC_DATA resource_list;

 
 /*******************************************/
 /*** SURF Globals **************************/
 
 /*******************************************/
 /*** SURF Globals **************************/