Allow gcc cross-compiling targetting windows, which does not like exported symbols...

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

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 8cbf635..670cf5e 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -244,11 +244,11 @@ XBT_PUBLIC_DATA(surf_cpu_model_t) surf_cpu_model;
  */
 XBT_PUBLIC(void) surf_cpu_model_init_Cas01(const char *filename);
 
  */
 XBT_PUBLIC(void) surf_cpu_model_init_Cas01(const char *filename);
 

-XBT_PUBLIC_DATA(int) surf_cpu_model_description_size;
+#define surf_cpu_model_description_size 1

 /** \brief The list of all available cpu model models
  *  \ingroup SURF_models
  */
 /** \brief The list of all available cpu model models
  *  \ingroup SURF_models
  */

-XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_cpu_model_description[surf_cpu_model_description_size];

 
 /* Network model */
 
 
 /* Network model */
 


@@ -354,7 +354,7 @@ XBT_PUBLIC(void) surf_network_model_init_Vegas(const char *filename);
  *
  *  Reference:
  *
  *
  *  Reference:
  *

- *  [TAG03]. Corinne Touati, Eitan Altman, and Jérôme Galtier.  
+ *  [TAG03]. Corinne Touati, Eitan Altman, and Jerome Galtier.  

  *  Semi-definite programming approach for bandwidth allocation and routing in networks.
  *  Game Theory and Applications, 9:169-179, December 2003. Nova publisher.
  *
  *  Semi-definite programming approach for bandwidth allocation and routing in networks.
  *  Game Theory and Applications, 9:169-179, December 2003. Nova publisher.
  *


@@ -363,13 +363,17 @@ XBT_PUBLIC(void) surf_network_model_init_Vegas(const char *filename);
 XBT_PUBLIC(void) surf_network_model_init_SDP(const char *filename);
 #endif
 
 XBT_PUBLIC(void) surf_network_model_init_SDP(const char *filename);
 #endif
 

-
-
-XBT_PUBLIC_DATA(int) surf_network_model_description_size;
+#if defined(HAVE_GTNETS) && defined(HAVE_SDP)
+# define surf_network_model_description_size  5
+#elsif defined(HAVE_GTNETS) || defined(HAVE_SDP)
+# define surf_network_model_description_size  4
+#else 
+# define surf_network_model_description_size  3
+#endif   

 /** \brief The list of all available network model models
  *  \ingroup SURF_models
  */
 /** \brief The list of all available network model models
  *  \ingroup SURF_models
  */

-XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_network_model_description[surf_network_model_description_size];

 
 /** \brief Workstation model extension public
  *  \ingroup SURF_models
 
 /** \brief Workstation model extension public
  *  \ingroup SURF_models


@@ -469,11 +473,11 @@ XBT_PUBLIC(void) surf_workstation_model_init_KCCFLN05(const char *filename);
  */
 XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(const char *filename);
 
  */
 XBT_PUBLIC(void) surf_workstation_model_init_ptask_L07(const char *filename);
 

-XBT_PUBLIC_DATA(int) surf_workstation_model_description_size;
+#define surf_workstation_model_description_size 4

 /** \brief The list of all available workstation model models
  *  \ingroup SURF_models
  */
 /** \brief The list of all available workstation model models
  *  \ingroup SURF_models
  */

-XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[];
+XBT_PUBLIC_DATA(s_surf_model_description_t) surf_workstation_model_description[surf_workstation_model_description_size];

 
 /** \brief The network links
  *  \ingroup SURF_models
 
 /** \brief The network links
  *  \ingroup SURF_models

diff --git a/src/surf/surf.c b/src/surf/surf.c
index a87fa27..83bfde3 100644 (file)
--- a/src/surf/surf.c
+++ b/src/surf/surf.c
@@ -125,15 +125,7 @@ const char *surf_action_state_names[6] = {
   "SURF_ACTION_NOT_IN_THE_SYSTEM"
 };
 
   "SURF_ACTION_NOT_IN_THE_SYSTEM"
 };
 

-int surf_network_model_description_size = 3
-#ifdef HAVE_GTNETS
-    + 1
-#endif
-#ifdef HAVE_SDP
-    + 1
-#endif
-    ;
-s_surf_model_description_t surf_network_model_description[] = {
+s_surf_model_description_t surf_network_model_description[surf_network_model_description_size] = {

   {"CM02", NULL, surf_network_model_init_CM02},
 #ifdef HAVE_GTNETS
   {"GTNets", NULL, surf_network_model_init_GTNETS},
   {"CM02", NULL, surf_network_model_init_CM02},
 #ifdef HAVE_GTNETS
   {"GTNets", NULL, surf_network_model_init_GTNETS},


@@ -145,13 +137,11 @@ s_surf_model_description_t surf_network_model_description[] = {
   {"Vegas", NULL, surf_network_model_init_Vegas}
 };
 
   {"Vegas", NULL, surf_network_model_init_Vegas}
 };
 

-int surf_cpu_model_description_size = 1;
-s_surf_model_description_t surf_cpu_model_description[] = {
+s_surf_model_description_t surf_cpu_model_description[surf_cpu_model_description_size] = {

   {"Cas01", NULL, surf_cpu_model_init_Cas01},
 };
 
   {"Cas01", NULL, surf_cpu_model_init_Cas01},
 };
 

-int surf_workstation_model_description_size = 4;
-s_surf_model_description_t surf_workstation_model_description[] = {
+s_surf_model_description_t surf_workstation_model_description[surf_workstation_model_description_size] = {

   {"CLM03", NULL, surf_workstation_model_init_CLM03, create_workstations},
   {"compound", NULL, surf_workstation_model_init_compound, NULL},
   {"ptask_L07", NULL, surf_workstation_model_init_ptask_L07, NULL}
   {"CLM03", NULL, surf_workstation_model_init_CLM03, create_workstations},
   {"compound", NULL, surf_workstation_model_init_compound, NULL},
   {"ptask_L07", NULL, surf_workstation_model_init_ptask_L07, NULL}