Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

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

diff --git a/src/simix/simcalls.py b/src/simix/simcalls.py
index c6854e56a91748386472e5b1aa27f948c02077d9..706dc92cd6fb8a1fc43631b42583333026d95322 100755 (executable)
--- a/src/simix/simcalls.py
+++ b/src/simix/simcalls.py
@@ -235,7 +235,7 @@ def header(name):
 def handle(fd, func, simcalls, guarded_simcalls):
     def nonempty(e): 
         return e != ''
-    fd.write('\n'.join(filter(nonempty, func(simcall) for simcall in simcalls)))
+    fd.write('\n'.join(filter(nonempty, (func(simcall) for simcall in simcalls))))
 
     for guard, list in guarded_simcalls.items():
         fd.write('\n#if %s\n' % (guard))
@@ -290,7 +290,7 @@ if __name__ == '__main__':
 
     fd.write('#include <xbt/base.h>\n')
     fd.write('#include "smx_private.h"\n')
-    fd.write('#if HAVE_MC\n')
+    fd.write('#if SIMGRID_HAVE_MC\n')
     fd.write('#include "src/mc/mc_forward.hpp"\n')
     fd.write('#endif\n')
     fd.write('\n')