Make GTNETS compatible with new parsing and variable name convention.

[simgrid.git] / src / include / surf / surf.h

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 16dd164..469348a 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -8,6 +8,7 @@
 #ifndef _SURF_SURF_H
 #define _SURF_SURF_H
 
+#include "portable.h"
 #include "xbt/swag.h"
 #include "xbt/dynar.h"
 #include "xbt/dict.h"
@@ -378,13 +379,19 @@ XBT_PUBLIC(void) surf_network_model_init_Vegas(const char *filename);
 XBT_PUBLIC(void) surf_network_model_init_SDP(const char *filename);
 #endif
 
-#if defined(HAVE_GTNETS) && defined(HAVE_SDP)
-# define surf_network_model_description_size  6
-#elsif defined(HAVE_GTNETS) || defined(HAVE_SDP)
-# define surf_network_model_description_size  5
+#if (HAVE_GTNETS)
+# define inc_GT 1
 #else 
-# define surf_network_model_description_size  4
-#endif   
+# define inc_GT 0
+#endif
+#if (HAVE_SDP)
+# define inc_SDP 1
+#else
+# define inc_SDP 0
+#endif
+
+#define surf_network_model_description_size  4+inc_SDP+inc_GT
+
 /** \brief The list of all available network model models
  *  \ingroup SURF_models
  */
@@ -575,7 +582,6 @@ XBT_PUBLIC(void) surf_exit(void);
 /* Prototypes of the functions that handle the properties */
 XBT_PUBLIC_DATA(xbt_dict_t) current_property_set; /* the prop set for the currently parsed element (also used in SIMIX) */
 void parse_properties(void);
-void free_string(void*);
 
 /* Prototypes for functions handling routing and were factorized succesfully from the models */
 void init_data(void);