diff options
author | Cristian Rodríguez <crrodriguez@opensuse.org> | 2013-04-01 03:08:05 -0300 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-04-01 23:43:48 -0400 |
commit | 9607d9470eec07df817e58f64d312ccb5ac4cfcc (patch) | |
tree | d0d933b13ec47e4d22dcee3078af94e89a998e6e /src/shared/util.c | |
parent | e5ec62c56963d997edaffa904af5dc45dac23988 (diff) |
Always use our own MAX/MIN definitions
code in src/shared/macro.h only defined MAX/MIN in case
they were not defined previously. however the MAX/MIN
macros implemented in glibc are not of the "safe" kind but defined
as:
define MIN(a,b) (((a)<(b))?(a):(b))
define MAX(a,b) (((a)>(b))?(a):(b))
Avoid nasty side effects by using our own versions instead.
Also fix the warnings derived from this change.
[zj: - modify MAX3 macro to fix warning about _a shadowing _a,
- do bootchart/svg.c too,
- remove unused MIN3.]
Diffstat (limited to 'src/shared/util.c')
-rw-r--r-- | src/shared/util.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/util.c b/src/shared/util.c index b516b9b053..46c20bec9c 100644 --- a/src/shared/util.c +++ b/src/shared/util.c @@ -5862,7 +5862,7 @@ void* greedy_realloc(void **p, size_t *allocated, size_t need) { if (*allocated >= need) return *p; - a = MAX(64, need * 2); + a = MAX(64u, need * 2); q = realloc(*p, a); if (!q) return NULL; |