From 026d84af64aa8d801194750393ef73941005e28b Mon Sep 17 00:00:00 2001 From: joerg Date: Fri, 17 Feb 2017 17:00:30 +0000 Subject: Don't define accept4 locally on new enough NetBSD current. --- comms/openobex/distinfo | 3 ++- comms/openobex/patches/patch-lib_cloexec.h | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 comms/openobex/patches/patch-lib_cloexec.h (limited to 'comms') diff --git a/comms/openobex/distinfo b/comms/openobex/distinfo index 61b724973d4..d5c45e9aac4 100644 --- a/comms/openobex/distinfo +++ b/comms/openobex/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.10 2015/11/03 01:34:56 agc Exp $ +$NetBSD: distinfo,v 1.11 2017/02/17 17:00:30 joerg Exp $ SHA1 (openobex-1.7.1-Source.tar.gz) = b70e10ac21737fd1280cfb4d7408f623118ed355 RMD160 (openobex-1.7.1-Source.tar.gz) = fd06ffd6fd4fd8457c81c300b4e7c790def49f52 SHA512 (openobex-1.7.1-Source.tar.gz) = df38b363bd4c6eb6c0181fc7858fb03ac2bdfa85d8496faaa514d5cc4473b33c883956d4e1c94c3fefa5e44e5eed35a8dfcab889ce6ca8c29694f2b18334754e Size (openobex-1.7.1-Source.tar.gz) = 131091 bytes SHA1 (patch-lib_api.c) = 4ea3f2b8179a52a4d1266395a4f20b572582903f +SHA1 (patch-lib_cloexec.h) = 374794dd6d46b9448b51f98230545afa3cb26ddf diff --git a/comms/openobex/patches/patch-lib_cloexec.h b/comms/openobex/patches/patch-lib_cloexec.h new file mode 100644 index 00000000000..6ab620be384 --- /dev/null +++ b/comms/openobex/patches/patch-lib_cloexec.h @@ -0,0 +1,20 @@ +$NetBSD: patch-lib_cloexec.h,v 1.1 2017/02/17 17:00:30 joerg Exp $ + +--- lib/cloexec.h.orig 2012-03-26 18:25:19.000000000 +0000 ++++ lib/cloexec.h +@@ -45,12 +45,15 @@ static __inline socket_t socket_cloexec( + + /* This supports an accept4() equivalent on NetBSD 6 and later */ + #if defined(SOCK_CLOEXEC) && defined(__NetBSD__) ++#include ++#if __NetBSD_Version__ < 799005900 + static __inline int accept4(int s, struct sockaddr * addr, socklen_t *addrlen, + int flags) + { + return paccept(s, addr, addrlen, NULL, flags); + } + #endif ++#endif + + static __inline socket_t accept_cloexec(socket_t sockfd, struct sockaddr *addr, + socklen_t *addrlen) -- cgit v1.2.3