diff options
| author | Maxython <mixython@gmail.com> | 2023-02-10 23:00:51 +0300 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2023-05-02 14:52:27 +0200 |
| commit | b40fcda7fb5583ce516cd585a5f8f25ec00aa80e (patch) | |
| tree | eb8e07c141c2081429a9d9588e308e63f15d34c0 | |
| parent | a8afb0449c6a898180982369f543b50393bb90b6 (diff) | |
| download | alsa-lib-b40fcda7fb5583ce516cd585a5f8f25ec00aa80e.tar.gz | |
compilation: fix ANDROID -> __ANDROID__ define detection
Fixes: https://github.com/alsa-project/alsa-lib/pull/301/
Signed-off-by: Maxython <mixython@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
| -rw-r--r-- | src/conf.c | 2 | ||||
| -rw-r--r-- | src/pcm/pcm_direct.c | 2 | ||||
| -rw-r--r-- | src/ucm/parser.c | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -4116,7 +4116,7 @@ static int config_file_load(snd_config_t *root, const char *fn, int errors) if (!S_ISDIR(st.st_mode)) return config_file_open(root, fn); #ifndef DOC_HIDDEN -#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) && !defined(__sun) && !defined(ANDROID) +#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) && !defined(__sun) && !defined(__ANDROID__) #define SORTFUNC versionsort64 #else #define SORTFUNC alphasort64 diff --git a/src/pcm/pcm_direct.c b/src/pcm/pcm_direct.c index 3cc5305f..8ee9b4db 100644 --- a/src/pcm/pcm_direct.c +++ b/src/pcm/pcm_direct.c @@ -44,7 +44,7 @@ * */ -#if !defined(__OpenBSD__) && !defined(__DragonFly__) +#if !defined(__OpenBSD__) && !defined(__DragonFly__) && !defined(__ANDROID__) union semun { int val; /* Value for SETVAL */ struct semid_ds *buf; /* Buffer for IPC_STAT, IPC_SET */ diff --git a/src/ucm/parser.c b/src/ucm/parser.c index b0ac1006..c111661f 100644 --- a/src/ucm/parser.c +++ b/src/ucm/parser.c @@ -2915,7 +2915,7 @@ int uc_mgr_scan_master_configs(const char **_list[]) snprintf(filename, sizeof(filename), "%s/ucm2/conf.virt.d", snd_config_topdir()); -#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) && !defined(__sun) && !defined(ANDROID) +#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__DragonFly__) && !defined(__sun) && !defined(__ANDROID__) #define SORTFUNC versionsort64 #else #define SORTFUNC alphasort64 |