Move a definition around so that other network models don't need to see CM02 internals...

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 82d9103..646b806 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -49,6 +49,7 @@ EXTRA_DIST= \
        surf/simgrid_dtd.c \
        surf/simgrid.dtd \
        surf/network_private.h \
+       surf/network_common.h \
        surf/network_gtnets_private.h \
        \
        include/surf/maxmin.h \

diff --git a/src/surf/network_common.h b/src/surf/network_common.h
new file mode 100644 (file)
index 0000000..6e26f2e
--- /dev/null
+++ b/src/surf/network_common.h
@@ -0,0 +1,16 @@
+/*     $Id$     */
+
+/* Copyright (c) 2004 Arnaud Legrand. All rights reserved.                  */
+
+/* This program is free software; you can redistribute it and/or modify it
+ * under the terms of the license (GNU LGPL) which comes with this package. */
+
+#ifndef _SURF_NETWORK_COMMON_H
+#define _SURF_NETWORK_COMMON_H
+
+#include "xbt/dict.h"
+
+extern xbt_dict_t network_card_set;
+
+
+#endif                         /* _SURF_NETWORK_COMMON_H */

diff --git a/src/surf/network_private.h b/src/surf/network_private.h
index cba58fb..9b1ee76 100644 (file)
--- a/src/surf/network_private.h
+++ b/src/surf/network_private.h
@@ -9,6 +9,7 @@
 #define _SURF_NETWORK_PRIVATE_H
 
 #include "surf_private.h"
+#include "network_common.h"
 #include "xbt/dict.h"
 
 typedef struct network_link_CM02 {
@@ -44,9 +45,6 @@ typedef struct surf_action_network_CM02 {
   network_card_CM02_t dst;
 } s_surf_action_network_CM02_t, *surf_action_network_CM02_t;
 
-extern xbt_dict_t network_card_set;
-
-
 extern int card_number;
 extern link_CM02_t **routing_table;
 extern int *routing_table_size;

diff --git a/src/surf/workstation.c b/src/surf/workstation.c
index 379cf32..733aac7 100644 (file)
--- a/src/surf/workstation.c
+++ b/src/surf/workstation.c
@@ -10,7 +10,7 @@
 #include "portable.h"
 #include "workstation_private.h"
 #include "cpu_private.h"
-#include "network_private.h"
+#include "network_common.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_workstation, surf,
                                "Logging specific to the SURF workstation module");