A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
properly protect our definitions of MIN/MAX (w/o using undef to please sonar)
[simgrid.git]
/
src
/
xbt
/
mallocator.c
diff --git
a/src/xbt/mallocator.c
b/src/xbt/mallocator.c
index
ec32f17
..
9b7bd8e
100644
(file)
--- a/
src/xbt/mallocator.c
+++ b/
src/xbt/mallocator.c
@@
-1,6
+1,6
@@
/* mallocator - recycle objects to avoid malloc() / free() */
/* mallocator - recycle objects to avoid malloc() / free() */
-/* Copyright (c) 2006-201
7
. The SimGrid Team.
+/* Copyright (c) 2006-201
8
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-13,6
+13,13
@@
#include "xbt/asserts.h"
#include "xbt/sysdep.h"
#include "xbt/asserts.h"
#include "xbt/sysdep.h"
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mallocator, xbt, "Mallocators");
/** Implementation note on the mallocators:
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(xbt_mallocator, xbt, "Mallocators");
/** Implementation note on the mallocators: