From 869e112fd4bb47fc88e5eae3357dce84bbf7dcbb Mon Sep 17 00:00:00 2001 From: Augustin Degomme Date: Sun, 1 Dec 2019 18:22:40 +0100 Subject: [PATCH] rename this macro. It's actually useful outside of sampi, to disable malloc override when it conflicts with other codes and is not needed. Fors instance FFTW uses FFTW(malloc(x)) to actually call fftw_malloc, and our macro was then breaking compilation. --- include/smpi/sampi.h | 2 +- include/smpi/smpi_helpers.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/smpi/sampi.h b/include/smpi/sampi.h index 701df112b1..6ed1aa80db 100644 --- a/include/smpi/sampi.h +++ b/include/smpi/sampi.h @@ -6,7 +6,7 @@ #ifndef SAMPI_H_ #define SAMPI_H_ -#define SAMPI_OVERRIDEN_MALLOC +#define SMPI_NO_OVERRIDE_MALLOC #include #include diff --git a/include/smpi/smpi_helpers.h b/include/smpi/smpi_helpers.h index 9a07509921..8c47f828ea 100644 --- a/include/smpi/smpi_helpers.h +++ b/include/smpi/smpi_helpers.h @@ -32,7 +32,7 @@ #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 +#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) -- 2.20.1