Skip to content

Commit 323510e

Browse files
committed
Fix DARWIN (AF_SYSTEM) capability check
This may not have been enabled properly in all environments.
1 parent e21e462 commit 323510e

2 files changed

Lines changed: 10 additions & 9 deletions

File tree

junixsocket-native/src/main/c/config.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -226,16 +226,17 @@ extern "C" {
226226

227227
// Linux
228228
#ifdef __linux__
229-
#undef junixsocket_have_sun_len
229+
# undef junixsocket_have_sun_len
230230

231-
#if !defined(JUNIXSOCKET_HARDEN_CMSG_NXTHDR)
231+
# if !defined(JUNIXSOCKET_HARDEN_CMSG_NXTHDR)
232232
// workaround for systems using musl libc
233-
# define JUNIXSOCKET_HARDEN_CMSG_NXTHDR 1
234-
#endif
233+
# define JUNIXSOCKET_HARDEN_CMSG_NXTHDR 1
234+
# endif
235235

236-
#include <linux/tipc.h>
237-
#include <arpa/inet.h>
238-
#define junixsocket_have_tipc 1
236+
# include <linux/tipc.h>
237+
# include <arpa/inet.h>
238+
# define junixsocket_have_tipc 1
239+
#endif // __linux__
239240

240241
#if __TOS_MVS__
241242
// z/OS XLC doesn't have __has_include
@@ -245,14 +246,13 @@ extern "C" {
245246
#include <linux/vm_sockets.h>
246247
#define junixsocket_have_vsock 1
247248
#endif
248-
#endif
249249

250250
#if defined(__MACH__) && __has_include(<sys/kern_control.h>)
251251
# include <sys/kern_control.h>
252252
# define junixsocket_have_system 1
253253
#endif
254254

255-
#endif
255+
#endif // not __TOS_MVS_
256256

257257
// Solaris
258258
#if defined(__sun) || defined(__sun__)

src/site/markdown/changelog.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ artifact (`<type>pom</type>`); see [Add junixsocket to your project](dependency.
1515
### _(2023-09-09)_ **junixsocket 2.7.1**
1616

1717
- Fix openDatagramChannelPair (was using STREAM instead of DGRAM), add AFSocketType support
18+
- Fix availability of AF_SYSTEM capability on Darwin
1819
- Improve SelectionKey logic, reduce locking/GC overhead
1920
- Improve "unsupported operation" handling in native code
2021
- Improve handling of "test aborted, but not really an issue"

0 commit comments

Comments
 (0)