summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/net/iso88025.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/net/iso88025.h b/sys/net/iso88025.h
index aad8d54..1c38b91 100644
--- a/sys/net/iso88025.h
+++ b/sys/net/iso88025.h
@@ -114,9 +114,11 @@ struct iso88025_sockaddr_dl_data {
u_short *trld_route[RIF_MAX_LEN];
};
+#define ISO88025_MIN(a, b) (((a)<(b))?(a):(b))
#define SDL_ISO88025(s) ((struct iso88025_sockaddr_dl_data *) \
- ((s)->sdl_data + min((s)->sdl_nlen + \
- (s)->sdl_alen + (s)->sdl_slen, 12)))
+ ((s)->sdl_data + \
+ ISO88025_MIN((s)->sdl_nlen + (s)->sdl_alen + \
+ (s)->sdl_slen, 12)))
/*
* Structure of a 48-bit iso 802.5 address.
OpenPOWER on IntegriCloud