factoring and cleanups for msg/tracing

[simgrid.git] / src / simdag / sd_dotloader.cpp

diff --git a/src/simdag/sd_dotloader.cpp b/src/simdag/sd_dotloader.cpp
index 5419345..2a93172 100644 (file)
--- a/src/simdag/sd_dotloader.cpp
+++ b/src/simdag/sd_dotloader.cpp
@@ -6,21 +6,13 @@
 
 #include "src/simdag/simdag_private.h"
 #include "simgrid/simdag.h"
-#include "xbt/log.h"
-#include <stdbool.h>
+#include "xbt/file.h"
 #include <string.h>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_dotparse, sd, "Parsing DOT files");
 
-#undef CLEANUP
-
-#ifdef HAVE_CGRAPH_H
+#ifdef HAVE_GRAPHVIZ
 #include <graphviz/cgraph.h>
-#elif HAVE_AGRAPH_H
-#include <graphviz/agraph.h>
-#define agnxtnode(dot, node)    agnxtnode(node)
-#define agfstout(dot, node)     agfstout(node)
-#define agnxtout(dot, edge)     agnxtout(edge)
 #endif
 
 typedef enum {
@@ -30,7 +22,6 @@ typedef enum {
 
 xbt_dynar_t SD_dotload_generic(const char * filename, seq_par_t seq_or_par, bool schedule);
 
-
 static void dot_task_p_free(void *task) {
   SD_task_destroy(*(SD_task_t *)task);
 }