From 740d8ec5ab959fce70cecf877a0bddfc52cbfe0e Mon Sep 17 00:00:00 2001 From: Denis Krjuchkov Date: Mon, 18 Nov 2013 16:35:22 +0600 Subject: system/fd_util.h: avoid symbol conflict with statically linked libmpdclient --- src/system/fd_util.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/system/fd_util.h b/src/system/fd_util.h index 9003b1616..b7a9a6dd3 100644 --- a/src/system/fd_util.h +++ b/src/system/fd_util.h @@ -104,6 +104,11 @@ socketpair_cloexec_nonblock(int domain, int type, int protocol, int sv[2]); #endif +#ifdef HAVE_LIBMPDCLIENT +/* Avoid symbol conflict with statically linked libmpdclient */ +#define socket_cloexec_nonblock socket_cloexec_nonblock_noconflict +#endif + /** * Wrapper for socket(), which sets the CLOEXEC and the NONBLOCK flag * (atomically if supported by the OS). -- cgit v1.2.3