From: Arnaud Giersch <arnaud.giersch@univ-fcomte.fr>
Date: Tue, 17 Oct 2017 15:56:42 +0000 (+0200)
Subject: Remove old #define/#undef.
X-Git-Tag: v3.18~420^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/c82612f115c9741b134e7cba11e28bb706acacd7?ds=sidebyside

Remove old #define/#undef.

CLEANUP seems to be a leftover of old C xbt exceptions, and register is not
used anymore (use flex >= 2.6.0).
---

diff --git a/src/simdag/sd_daxloader.cpp b/src/simdag/sd_daxloader.cpp
index d061716cc8..409caeec7a 100644
--- a/src/simdag/sd_daxloader.cpp
+++ b/src/simdag/sd_daxloader.cpp
@@ -14,11 +14,8 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(sd_daxparse, sd, "Parsing DAX files");
 
 extern "C" {
-# undef CLEANUP
-# include "dax_dtd.h"
-# define register /* g++ don't like register, so don't say it */
-# include "dax_dtd.c"
-# undef register
+#include "dax_dtd.h"
+#include "dax_dtd.c"
 }
 
 /* Ensure that transfer tasks have unique names even though a file is used several times */