summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicael Karlberg <bmk@erlang.org>2019-11-29 10:21:21 +0100
committerMicael Karlberg <bmk@erlang.org>2019-11-29 10:21:21 +0100
commit868d629060e8077157b9685c3a2a1d2a33f9cc3e (patch)
tree67baf1171e89c55c3f25eb9f53f904ec31bf85da
parent24327177f0e84d9b0d6a8c67c89643199d609d1a (diff)
parent8a2204fa0d3b669a752201d289ddcd4c57417891 (diff)
downloaderlang-868d629060e8077157b9685c3a2a1d2a33f9cc3e.tar.gz
Merge branch 'bmk/erts/esock/20191127/extended_error_on_old_linux/OTP-16302' into maint
-rw-r--r--erts/emulator/nifs/common/socket_nif.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/emulator/nifs/common/socket_nif.c b/erts/emulator/nifs/common/socket_nif.c
index e36cd38ece..864fe1a558 100644
--- a/erts/emulator/nifs/common/socket_nif.c
+++ b/erts/emulator/nifs/common/socket_nif.c
@@ -167,6 +167,12 @@
#include <setns.h>
#endif
#ifdef HAVE_LINUX_ERRQUEUE_H
+#include <linux/types.h> /* On some (I assume) "old" linux, *
+ * for example SLES 10 SP1, this is *
+ * not (explicitly) included by the *
+ * errqueue file. And for some reason *
+ * configure does not detect this. *
+ * So, to simplify, we include here. */
#include <linux/errqueue.h>
#include <linux/icmp.h>
#include <linux/icmpv6.h>