The branch, master has been updated
via 86fd744 swrap: Mark flags in swrap_accept4 as unused
via 46615cd swrap: Fix the build on BSD and Solaris
from d8cf3b0 swrap: Handle threads that fork
https://git.samba.org/?p=socket_wrapper.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 86fd744333ddc74d32d301f316ce83e3a2d0c844
Author: Andreas Schneider <[email protected]>
Date: Fri Oct 21 08:04:02 2016 +0200
swrap: Mark flags in swrap_accept4 as unused
This removes a compiler warning on non-Linux systems.
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
commit 46615cd9119e0e66175768e1757c9bc3e15b9cc8
Author: Andreas Schneider <[email protected]>
Date: Fri Oct 21 07:56:24 2016 +0200
swrap: Fix the build on BSD and Solaris
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
src/socket_wrapper.c | 6 ++++++
1 file changed, 6 insertions(+)
Changeset truncated at 500 lines:
diff --git a/src/socket_wrapper.c b/src/socket_wrapper.c
index 6679d5c..fb92904 100644
--- a/src/socket_wrapper.c
+++ b/src/socket_wrapper.c
@@ -142,6 +142,8 @@ enum swrap_dbglvl_e {
#define discard_const_p(type, ptr) ((type *)discard_const(ptr))
#endif
+#define UNUSED(x) (void)(x)
+
#ifdef IPV6_PKTINFO
# ifndef IPV6_RECVPKTINFO
# define IPV6_RECVPKTINFO IPV6_PKTINFO
@@ -512,7 +514,9 @@ struct swrap_libc_symbols {
#endif
SWRAP_SYMBOL_ENTRY(socket);
SWRAP_SYMBOL_ENTRY(socketpair);
+#ifdef HAVE_TIMERFD_CREATE
SWRAP_SYMBOL_ENTRY(timerfd_create);
+#endif
SWRAP_SYMBOL_ENTRY(write);
SWRAP_SYMBOL_ENTRY(writev);
};
@@ -2882,6 +2886,7 @@ static int swrap_accept(int s,
#ifdef HAVE_ACCEPT4
return libc_accept4(s, addr, addrlen, flags);
#else
+ UNUSED(flags);
return libc_accept(s, addr, addrlen);
#endif
}
@@ -2899,6 +2904,7 @@ static int swrap_accept(int s,
#ifdef HAVE_ACCEPT4
ret = libc_accept4(s, &un_addr.sa.s, &un_addr.sa_socklen, flags);
#else
+ UNUSED(flags);
ret = libc_accept(s, &un_addr.sa.s, &un_addr.sa_socklen);
#endif
if (ret == -1) {
--
Socket Wrapper Repository
