Merge branch 'bugfix/linux_target_mac' into 'master'

fix(linux): fixed build errors on MacOS Closes IDF-9791 See merge request espressif/esp-idf!30525
espressif · May 6, 2024 · 8c51cc6 · 8c51cc6
2 parents f311c23 + 2f0ef33
commit 8c51cc6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/components/esp_hw_support/port/linux/esp_random.c b/components/esp_hw_support/port/linux/esp_random.c
@@ -6,7 +6,13 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <assert.h>
+
+// getentropy live in different header files on Mac and Linux
+#if (defined(__APPLE__) && defined(__MACH__))
+#include <sys/random.h>
+#else
 #include <unistd.h>
+#endif
 
 #include "esp_log.h"
 

diff --git a/components/linux/linux_include/sys/cdefs.h → components/linux/include/sys/cdefs.h b/components/linux/linux_include/sys/cdefs.h → components/linux/include/sys/cdefs.h
@@ -12,6 +12,20 @@
 
 #pragma once
 
+#if (defined(__APPLE__) && defined(__MACH__))
+// MacOS
+
+#if !defined(__containerof)
+#define __containerof(ptr, type, member) ({         \
+    const typeof( ((type *)0)->member ) *__mptr = (ptr); \
+    (type *)( (char *)__mptr - offsetof(type,member) );})
+#endif
+
+#include_next <sys/cdefs.h> // include the actual cdefs.h (which does not contain containerof)
+
+#else
+// Linux
+
 #include <stdint.h>
 
 // We need a define. We can't typedef here since, depending on the include order,
@@ -20,3 +34,5 @@
 
 #include_next <sys/cdefs.h>
 #include <bsd/sys/cdefs.h>
+
+#endif