oops, this bit wasn't meant to be reverted.

[simgrid.git] / include / smpi / smpi_helpers.h

diff --git a/include/smpi/smpi_helpers.h b/include/smpi/smpi_helpers.h
index 543f702..5772c93 100644 (file)
--- a/include/smpi/smpi_helpers.h
+++ b/include/smpi/smpi_helpers.h
@@ -15,8 +15,8 @@
 #define sleep(x) smpi_sleep(x)
 #define usleep(x) smpi_usleep(x)
 #else
-#define sleep(x) { smpi_trace_set_call_location(__FILE__,__LINE__); smpi_sleep(x); }
-#define usleep(x) { smpi_trace_set_call_location(__FILE__,__LINE__); smpi_usleep(x); }
+#define sleep(x) ({ smpi_trace_set_call_location(__FILE__,__LINE__); smpi_sleep(x); })
+#define usleep(x) ({ smpi_trace_set_call_location(__FILE__,__LINE__); smpi_usleep(x); })
 #endif
 
 #define gettimeofday(x, y) smpi_gettimeofday((x), 0)
@@ -24,7 +24,7 @@
 #ifndef TRACE_CALL_LOCATION /* Defined by smpicc on the command line */
 #define nanosleep(x, y) smpi_nanosleep((x), (y))
 #else
-#define nanosleep(x) { smpi_trace_set_call_location(__FILE__,__LINE__); smpi_nanosleep(x); }
+#define nanosleep(x) ({ smpi_trace_set_call_location(__FILE__,__LINE__); smpi_nanosleep(x); })
 #endif
 #define clock_gettime(x, y) smpi_clock_gettime((x), (y))
 #endif
@@ -32,9 +32,9 @@
 #define getopt(x, y, z) smpi_getopt((x), (y), (z))
 #define getopt_long(x, y, z, a, b) smpi_getopt_long((x), (y), (z), (a), (b))
 #define getopt_long_only(x, y, z, a, b) smpi_getopt_long_only((x), (y), (z), (a), (b))
-#ifndef SAMPI_OVERRIDEN_MALLOC
-#define malloc(x) smpi_shared_malloc_intercept(x, __FILE__, __LINE__)
-#define calloc(x,y) smpi_shared_calloc_intercept(x,y, __FILE__, __LINE__)
+#ifndef SMPI_NO_OVERRIDE_MALLOC
+#define malloc(x) smpi_shared_malloc_intercept((x), __FILE__, __LINE__)
+#define calloc(x, y) smpi_shared_calloc_intercept((x), (y), __FILE__, __LINE__)
 #define free(x) smpi_shared_free(x)
 #endif
 #endif