From b40fcda7fb5583ce516cd585a5f8f25ec00aa80e Mon Sep 17 00:00:00 2001 From: Maxython Date: Fri, 10 Feb 2023 23:00:51 +0300 Subject: compilation: fix ANDROID -> __ANDROID__ define detection Fixes: https://github.com/alsa-project/alsa-lib/pull/301/ Signed-off-by: Maxython Signed-off-by: Jaroslav Kysela --- src/conf.c | 2 +- src/pcm/pcm_direct.c | 2 +- src/ucm/parser.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/conf.c b/src/conf.c index 65f2e1a7..da51182e 100644 --- a/src/conf.c +++ b/src/conf.c @@ -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 -- cgit v1.2.1