diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-16 01:03:00 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-09-16 01:03:00 +0000 |
| commit | fb5188d2a35856992cb27d5961fbe3b0cb2ffb89 (patch) | |
| tree | 974029addcb28418bebf867918d8b014de3868e3 | |
| parent | 98b0e235b5b830156c30f5d50c01d2b9be3b9e7d (diff) | |
| parent | dd90b872c8591d197c44476c1c7eb06266e72bc0 (diff) | |
| download | newfs_msdos-fb5188d2a35856992cb27d5961fbe3b0cb2ffb89.tar.gz | |
Snap for 7736735 from dd90b872c8591d197c44476c1c7eb06266e72bc0 to sdk-release
Change-Id: I8961f2eb46b0caa0811a42491ef4f369b339f26b
| -rw-r--r-- | freebsd-compat.h | 12 |
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 |