Roll my own min() (named ISO88025_MIN() so as to not cause conflicts) so
that this header may be included from userland where min() may not be declared (or worse, declared differently). I open to alternative solutions.
This commit is contained in:
parent
97fe20b4d0
commit
0ee3222df6
@ -114,9 +114,11 @@ struct iso88025_sockaddr_dl_data {
|
|||||||
u_short *trld_route[RIF_MAX_LEN];
|
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 *) \
|
#define SDL_ISO88025(s) ((struct iso88025_sockaddr_dl_data *) \
|
||||||
((s)->sdl_data + min((s)->sdl_nlen + \
|
((s)->sdl_data + \
|
||||||
(s)->sdl_alen + (s)->sdl_slen, 12)))
|
ISO88025_MIN((s)->sdl_nlen + (s)->sdl_alen + \
|
||||||
|
(s)->sdl_slen, 12)))
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Structure of a 48-bit iso 802.5 address.
|
* Structure of a 48-bit iso 802.5 address.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user