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>

diff --git a/src/conf.c b/src/conf.c
index 65f2e1a78838a76951797fa4bd40b9c477351749..da51182eae634837e5c215a488631cc61e5624a9 100644 (file)
--- 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 3cc5305f85795f9c3aa41a75a1659e877ad71985..8ee9b4db15fddd5d86e93a9a56f5b6e06508606a 100644 (file)
--- 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 b0ac10065e0e382cda42c7fd1ee954e42cbb277a..c111661f435fb44b7a15371f42081b38889cb525 100644 (file)
--- 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