rename a struct for consistency

[simgrid.git] / src / simix / simcalls.py

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index 73c78ce..3bf49a5 100755 (executable)
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -257,7 +257,7 @@ def handle(fd, func, simcalls, guarded_simcalls):
         '\n'.join(filter(nonempty, (func(simcall) for simcall in simcalls))))
 
     for guard, list in guarded_simcalls.items():
-        fd.write('\n#ifdef %s\n' % (guard))
+        fd.write('\n#if %s\n' % (guard))
         fd.write('\n'.join(func(simcall) for simcall in list))
         fd.write('\n#endif\n')
 
@@ -308,8 +308,8 @@ if __name__ == '__main__':
 
     fd.write('#include <xbt/base.h>\n')
     fd.write('#include "smx_private.h"\n')
-    fd.write('#ifdef HAVE_MC\n')
-    fd.write('#include "src/mc/mc_forward.h"\n')
+    fd.write('#if HAVE_MC\n')
+    fd.write('#include "src/mc/mc_forward.hpp"\n')
     fd.write('#endif\n')
     fd.write('\n')
     fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\n')
@@ -362,7 +362,7 @@ if __name__ == '__main__':
     #
     fd = header('popping_bodies.cpp')
     fd.write('#include "smx_private.h"\n')
-    fd.write('#include "src/mc/mc_forward.h"\n')
+    fd.write('#include "src/mc/mc_forward.hpp"\n')
     fd.write('#include "xbt/ex.h"\n')
     fd.write('#include <simgrid/simix.hpp>\n')
     handle(fd, Simcall.body, simcalls, simcalls_dict)