[git commit master 1/1] memalign: include sys/param.h for MAX

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Wed Mar 16 19:20:32 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=2f9445814cb01b460a1426d41e05c738a4a37f86
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

libc/stdlib/malloc/memalign.c:22:1: warning: "MAX" redefined In file included from
./libpthread/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h:25,
                 from ./include/bits/libc-lock.h:36,
                 from ./include/bits/stdio-lock.h:23,
                 from ./include/bits/uClibc_mutex.h:71,
                 from libc/stdlib/malloc/malloc.h:135,
                 from libc/stdlib/malloc/memalign.c:18:
./include/sys/param.h:75:1: warning: this is the location of the previous definition

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 libc/stdlib/malloc/memalign.c |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/libc/stdlib/malloc/memalign.c b/libc/stdlib/malloc/memalign.c
index 6826d62..5edd6e1 100644
--- a/libc/stdlib/malloc/memalign.c
+++ b/libc/stdlib/malloc/memalign.c
@@ -14,13 +14,12 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <sys/mman.h>
+#include <sys/param.h> /* MAX */
 
 #include "malloc.h"
 #include "heap.h"
 
 
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
-
 /*
       ______________________ TOTAL _________________________
      /                                                      \
-- 
1.7.3.4



More information about the uClibc-cvs mailing list