From 6112697b4d897cca54972eec49ac96cb2224d28b Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Thu, 9 Jun 2011 17:21:27 +0000 Subject: fix --- src/vpn/gnunet-daemon-vpn.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/vpn/gnunet-daemon-vpn.c b/src/vpn/gnunet-daemon-vpn.c index 384018107..6da86a0eb 100644 --- a/src/vpn/gnunet-daemon-vpn.c +++ b/src/vpn/gnunet-daemon-vpn.c @@ -236,11 +236,6 @@ new_ip6addr(unsigned char* buf, const GNUNET_HashCode *peer, const GNUNET_HashCo } /*}}}*/ -char -max (char a, char b) -{ - return a > b ? a : b; -} /** * Create a new Address from an answer-packet @@ -266,7 +261,7 @@ new_ip6addr_remote (unsigned char *buf, unsigned char *addr, char addrlen) int local_length = 16 - ipv6prefix; - memcpy (buf + ipv6prefix, addr, max (addrlen, local_length)); + memcpy (buf + ipv6prefix, addr, GNUNET_MAX (addrlen, local_length)); } /*}}}*/ -- cgit v1.2.3