diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:18:57 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-05-10 07:18:57 +0000 |
| commit | 6c6246361cd4d04a292d278cc7c56291e568471b (patch) | |
| tree | 974029addcb28418bebf867918d8b014de3868e3 | |
| parent | 67a6245e0fe265fa77b4ecec1ee7231ad876c596 (diff) | |
| parent | 3b9ae9a9990a08aad84b3bfd951d4cc328b4ba75 (diff) | |
| download | newfs_msdos-android13-mainline-os-statsd-release.tar.gz | |
Snap for 8564071 from 3b9ae9a9990a08aad84b3bfd951d4cc328b4ba75 to mainline-os-statsd-releaseaml_sta_331910000aml_sta_331811000aml_sta_331711010aml_sta_331610000aml_sta_331511000aml_sta_331410000aml_sta_331311000aml_sta_331010010aml_sta_330910000android13-mainline-os-statsd-release
Change-Id: Ibd2fe09a10c4ecd3d5741325e0858f676d3d91d0
| -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 |