diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:41:47 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-06-15 21:41:47 +0000 |
| commit | 820f2f7da5994e507673e998bfca885b6e17ba8e (patch) | |
| tree | a3968e4970cfd41c7c3b6852dee67840b000f2be /freebsd-compat.h | |
| parent | 3df017848d645fd4e08ffe7e6510447f4427806c (diff) | |
| parent | ddba8f4a4539f55883b4007edb38a222531f12f6 (diff) | |
| download | newfs_msdos-c0f1ff97a285dd7ddba48bb4cfea606824381d74.tar.gz | |
Snap for 8730993 from ddba8f4a4539f55883b4007edb38a222531f12f6 to mainline-tzdata3-releaseaml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010
Change-Id: Ib38bc969c5970a7f9c4a4bedc09536dd6496b31a
Diffstat (limited to 'freebsd-compat.h')
| -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 7ab9d70..1fdbafe 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 and musl don't. -#if defined(__GLIBC__) || defined(ANDROID_HOST_MUSL) +// Bionic, like the BSDs, has __unused. glibc doesn't. +#if defined(__GLIBC__) #define __unused __attribute__((__unused__)) #endif -// Neither macOS, glibc nor musl has __packed. -#if defined(__APPLE__) || defined(__GLIBC__) || defined(ANDROID_HOST_MUSL) +// Neither macOS nor glibc has __packed. +#if defined(__APPLE__) || defined(__GLIBC__) #define __packed __attribute__((__packed__)) #endif -// The BSDs (including Android and macOS) have getprogname(), but glibc and musl don't. -#if defined(__GLIBC__) || defined(ANDROID_HOST_MUSL) +// The BSDs (including Android and macOS) have getprogname(), but glibc doesn't. +#if defined(__GLIBC__) #include <errno.h> static inline char* getprogname() { return program_invocation_short_name; } #endif |