summaryrefslogtreecommitdiff
path: root/src/shared/prioq.c
diff options
context:
space:
mode:
authorCristian Rodríguez <crrodriguez@opensuse.org>2013-04-01 03:08:05 -0300
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2013-04-01 23:43:48 -0400
commit9607d9470eec07df817e58f64d312ccb5ac4cfcc (patch)
treed0d933b13ec47e4d22dcee3078af94e89a998e6e /src/shared/prioq.c
parente5ec62c56963d997edaffa904af5dc45dac23988 (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/prioq.c')
-rw-r--r--src/shared/prioq.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/shared/prioq.c b/src/shared/prioq.c
index 64c44aef82..a2205719b4 100644
--- a/src/shared/prioq.c
+++ b/src/shared/prioq.c
@@ -159,7 +159,7 @@ int prioq_put(Prioq *q, void *data, unsigned *idx) {
unsigned n;
struct prioq_item *j;
- n = MAX((q->n_items+1) * 2, 16);
+ n = MAX((q->n_items+1) * 2, 16u);
j = realloc(q->items, sizeof(struct prioq_item) * n);
if (!j)
return -ENOMEM;