summaryrefslogtreecommitdiffstats
path: root/libuuid/src
diff options
context:
space:
mode:
authorPetr Uzel2012-05-17 09:41:09 +0200
committerKarel Zak2012-05-23 09:56:51 +0200
commit96ce175801e0f48b914df90d9e707e9cf09e8443 (patch)
tree85af88b3dfe1000c5ed3677cd86b52fc23a905cb /libuuid/src
parenttext-utils: use min() from c.h (diff)
downloadkernel-qcow2-util-linux-96ce175801e0f48b914df90d9e707e9cf09e8443.tar.gz
kernel-qcow2-util-linux-96ce175801e0f48b914df90d9e707e9cf09e8443.tar.xz
kernel-qcow2-util-linux-96ce175801e0f48b914df90d9e707e9cf09e8443.zip
libuuid: use max() from c.h
Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
Diffstat (limited to 'libuuid/src')
-rw-r--r--libuuid/src/gen_uuid.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c
index 9d5575b85..613da0207 100644
--- a/libuuid/src/gen_uuid.c
+++ b/libuuid/src/gen_uuid.c
@@ -91,6 +91,7 @@
#include "uuidP.h"
#include "uuidd.h"
#include "randutils.h"
+#include "c.h"
#ifdef HAVE_TLS
#define THREAD_LOCAL static __thread
@@ -150,9 +151,6 @@ static int get_node_id(unsigned char *node_id)
* just sizeof(struct ifreq)
*/
#ifdef HAVE_SA_LEN
-#ifndef max
-#define max(a,b) ((a) > (b) ? (a) : (b))
-#endif
#define ifreq_size(i) max(sizeof(struct ifreq),\
sizeof((i).ifr_name)+(i).ifr_addr.sa_len)
#else