diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-21 01:43:39 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2014-12-21 01:43:39 +0000 |
| commit | 31009f586a04251df0fb5853017ecfcaf70b307f (patch) | |
| tree | 55848e7a769cfa4134c80933ed9527c11bfe44c0 /src/libunixonacid | |
| parent | 4557dacfbe04206c57e459b734016d2b6edfe7f3 (diff) | |
| download | skalibs-31009f586a04251df0fb5853017ecfcaf70b307f.tar.xz | |
So MSG_WAITALL can block even with MSG_DONTWAIT... wtfbsdseriously.
Only include MSG_WAITALL when it's tested nb, then.
Also test yet another fix for the tryancilautoclose FreeBSD problem.
Diffstat (limited to 'src/libunixonacid')
| -rw-r--r-- | src/libunixonacid/unixmessage_receive.c | 13 | ||||
| -rw-r--r-- | src/libunixonacid/unixmessage_sender_flush.c | 3 |
2 files changed, 13 insertions, 3 deletions
diff --git a/src/libunixonacid/unixmessage_receive.c b/src/libunixonacid/unixmessage_receive.c index 5c80082..d25195b 100644 --- a/src/libunixonacid/unixmessage_receive.c +++ b/src/libunixonacid/unixmessage_receive.c @@ -16,14 +16,21 @@ static int const awesomeflags = #ifdef SKALIBS_HASMSGDONTWAIT - MSG_WAITALL | MSG_DONTWAIT -#elif defined (SKALIBS_HASNBWAITALL) + MSG_DONTWAIT +#else + 0 +#endif + | +#ifdef SKALIBS_HASNBWAITALL MSG_WAITALL #else 0 #endif + | #ifdef SKALIBS_HASCMSGCLOEXEC - | MSG_CMSG_CLOEXEC + MSG_CMSG_CLOEXEC +#else + 0 #endif ; diff --git a/src/libunixonacid/unixmessage_sender_flush.c b/src/libunixonacid/unixmessage_sender_flush.c index 5c5ad2b..a115c58 100644 --- a/src/libunixonacid/unixmessage_sender_flush.c +++ b/src/libunixonacid/unixmessage_sender_flush.c @@ -1,6 +1,9 @@ /* ISC license. */ +#ifndef _XPG4_2 #define _XPG4_2 +#endif + #include <skalibs/sysdeps.h> #include <skalibs/nonposix.h> #include <sys/socket.h> |