From dcebfb11bc5a861c711e58838eec5b0131d020e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Harter?= <gaetan.harter@fu-berlin.de>
Date: Mon, 19 Mar 2018 17:40:28 +0100
Subject: [PATCH] posix/osx: fix type conflict on OSX native
In another header file, `socklen_t` is defined to `__darwin_socklen_t` which is
an `uint32_t` and it conflicts.
Preparation to remove NATIVEINCLUDES.
---
sys/posix/include/sys/bytes.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/sys/posix/include/sys/bytes.h b/sys/posix/include/sys/bytes.h
index fbdef4f495..eeae510071 100644
--- a/sys/posix/include/sys/bytes.h
+++ b/sys/posix/include/sys/bytes.h
@@ -28,7 +28,12 @@
extern "C" {
#endif
+#ifndef __MACH__
typedef size_t socklen_t; /**< socket address length */
+#else
+/* Defined for OSX with a different type */
+typedef __darwin_socklen_t socklen_t; /**< socket address length */
+#endif
#ifdef __cplusplus
}
--
GitLab