From: Petr Uzel <petr.uzel@suse.cz>
Date: Thu, 17 May 2012 07:41:09 +0000 (+0200)
Subject: libuuid: use max() from c.h
X-Git-Tag: v2.22-rc1~385
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96ce175801e0f48b914df90d9e707e9cf09e8443;p=thirdparty%2Futil-linux.git

libuuid: use max() from c.h

Signed-off-by: Petr Uzel <petr.uzel@suse.cz>
---

diff --git a/libuuid/src/gen_uuid.c b/libuuid/src/gen_uuid.c
index 9d5575b85c..613da02071 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