From: Gerald Pfeifer Subject: ws2_32: Define fill_control_message only when it's really used. (RESEND) Message-Id: Date: Sun, 17 Aug 2014 00:28:05 +0200 (CEST) I did not see this applied nor a response on wine-devel. This avoids a compiler warning about "defined, but not used". The sole user of fill_control_message is guarded by the very same condition. Gerald --- dlls/ws2_32/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 5900c8f..d5e9fd1 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -569,6 +569,7 @@ static const int ws_eai_map[][2] = static const char magic_loopback_addr[] = {127, 12, 34, 56}; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS +#ifdef IP_PKTINFO static inline WSACMSGHDR *fill_control_message(int level, int type, WSACMSGHDR *current, ULONG *maxsize, void *data, int len) { ULONG msgsize = sizeof(WSACMSGHDR) + WSA_CMSG_ALIGN(len); @@ -586,6 +587,7 @@ static inline WSACMSGHDR *fill_control_message(int level, int type, WSACMSGHDR * /* Return the pointer to where next entry should go */ return (WSACMSGHDR *) (ptr + WSA_CMSG_ALIGN(len)); } +#endif /* IP_PKTINFO */ static inline int convert_control_headers(struct msghdr *hdr, WSABUF *control) { -- 2.0.2