Skip to content

Commit

Permalink
Merge branch 'bmk/erts/esock/20230517/msghdr_on_solaris/OTP-18585' in…
Browse files Browse the repository at this point in the history
…to maint-26

* bmk/erts/esock/20230517/msghdr_on_solaris/OTP-18585:
  [erts|esock] Fixed if-defing for SOLARIS11
  • Loading branch information
Erlang/OTP committed Jun 8, 2023
2 parents dbf82af + c837aff commit 724f841
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions erts/emulator/nifs/unix/unix_socket_syncio.c
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,16 @@

#ifdef ESOCK_ENABLE

/* If we HAVE_SCTP_H and Solaris, we need to define the following in
* order to get SCTP working:
*/
#if (defined(HAVE_SCTP_H) && defined(__sun) && defined(__SVR4))
#define SOLARIS10 1
/* WARNING: This is not quite correct, it may also be Solaris 11! */
#define _XPG4_2
#define __EXTENSIONS__
#endif

#ifdef HAVE_SENDFILE
#if defined(__linux__) || (defined(__sun) && defined(__SVR4))
#include <sys/sendfile.h>
Expand Down

0 comments on commit 724f841

Please sign in to comment.