From: Chih-Wei Huang <cwhuang@android-x86.org>
Date: Fri, 15 Mar 2019 09:17:02 +0000 (+0800)
Subject: Android: avoid using versionsort
X-Git-Tag: v1.1.9~19
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=59715fb0783335b59309969c949da53cd3460900;p=alsa-lib.git

Android: avoid using versionsort

Android doesn't have versionsort yet.

Signed-off-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/src/conf.c b/src/conf.c
index b8db490c..cda5518e 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -3750,7 +3750,7 @@ int snd_config_hook_load(snd_config_t *root, snd_config_t *config, snd_config_t
 			int n;
 
 #ifndef DOC_HIDDEN
-#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun)
+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun) && !defined(ANDROID)
 #define SORTFUNC	versionsort
 #else
 #define SORTFUNC	alphasort
diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index 5e1a8862..ad6bcec7 100644
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -1532,7 +1532,7 @@ int uc_mgr_scan_master_configs(const char **_list[])
 			 snd_config_topdir());
 	filename[MAX_FILE-1] = '\0';
 
-#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun)
+#if defined(_GNU_SOURCE) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__sun) && !defined(ANDROID)
 #define SORTFUNC	versionsort
 #else
 #define SORTFUNC	alphasort