X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ebf52365999da9055076015c4d0296effd224795..302aab0c49d129b174ac42ee1b767d42f4be11a4:/include/smpi/sampi.h

diff --git a/include/smpi/sampi.h b/include/smpi/sampi.h
index 5e011d9d81..9290d99839 100644
--- a/include/smpi/sampi.h
+++ b/include/smpi/sampi.h
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-2020. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -6,7 +6,7 @@
 #ifndef SAMPI_H_
 #define SAMPI_H_
 
-#define SAMPI_OVERRIDEN_MALLOC
+#define SMPI_NO_OVERRIDE_MALLOC
 #include <stdlib.h>
 #include <smpi/smpi.h>
 
@@ -16,6 +16,7 @@
 
 #ifndef HAVE_SMPI
 #undef malloc
+#undef calloc
 #undef free
 // Internally disable these overrides (HAVE_SMPI is only defined when building the library)
 #define malloc(nbytes) _sampi_malloc(nbytes)