diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-25 12:31:07 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-03-25 12:31:07 +0000 |
| commit | 1f3fca6689824cff25f8c510d25108a227326b17 (patch) | |
| tree | 974029addcb28418bebf867918d8b014de3868e3 | |
| parent | 5bdce9def970e836065f85ff5abfb867990aab7a (diff) | |
| parent | 3b9ae9a9990a08aad84b3bfd951d4cc328b4ba75 (diff) | |
| download | newfs_msdos-android13-mainline-go-media-release.tar.gz | |
Snap for 8358640 from 3b9ae9a9990a08aad84b3bfd951d4cc328b4ba75 to mainline-go-media-releaseaml_go_med_330913000android13-mainline-go-media-release
Change-Id: Ic16851b1c65d64590f2e3b5dc2646925d4ae0026
| -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 |