Snap for 7737214 from 3b9ae9a9990a08aad84b3bfd951d4cc328b4ba75 to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r9android-platform-13.0.0_r8android-platform-13.0.0_r7android-platform-13.0.0_r6android-platform-13.0.0_r5android-platform-13.0.0_r4android-platform-13.0.0_r3android-platform-13.0.0_r2android-platform-13.0.0_r19android-platform-13.0.0_r18android-platform-13.0.0_r17android-platform-13.0.0_r16android-platform-13.0.0_r15android-platform-13.0.0_r14android-platform-13.0.0_r13android-platform-13.0.0_r12android-platform-13.0.0_r11android-platform-13.0.0_r10android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-platform-releaseandroid13-gsi

Change-Id: I4e3a5547268cb9826149540456b651759f1f3af2

1 files changed, 6 insertions, 6 deletions

diff --git a/freebsd-compat.h b/freebsd-compat.h
index 1fdbafe..7ab9d70 100644
--- a/freebsd-compat.h
+++ b/freebsd-compat.h
@@ -20,17 +20,17 @@
 #if __has_include(<sys/sysctl.h>)
 #include <sys/sysctl.h>
 #endif
-// Bionic, like the BSDs, has __unused. glibc doesn't.
-#if defined(__GLIBC__)
+// Bionic, like the BSDs, has __unused. glibc and musl don't.
+#if defined(__GLIBC__) || defined(ANDROID_HOST_MUSL)
 #define __unused __attribute__((__unused__))
 #endif
-// Neither macOS nor glibc has __packed.
-#if defined(__APPLE__) || defined(__GLIBC__)
+// Neither macOS, glibc nor musl has __packed.
+#if defined(__APPLE__) || defined(__GLIBC__) || defined(ANDROID_HOST_MUSL)
 #define __packed __attribute__((__packed__))
 #endif
 
-// The BSDs (including Android and macOS) have getprogname(), but glibc doesn't.
-#if defined(__GLIBC__)
+// The BSDs (including Android and macOS) have getprogname(), but glibc and musl don't.
+#if defined(__GLIBC__) || defined(ANDROID_HOST_MUSL)
 #include <errno.h>
 static inline char* getprogname() { return program_invocation_short_name; }
 #endif