Force to use alphasort64() sorting function for Harmony OS

Closes: https://github.com/alsa-project/alsa-lib/pull/467
Signed-off-by: wyjstrong <wyjstrong@163.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/src/conf.c b/src/conf.c
index 468d41f54b5846d7b2d343d73af53a9c41c02429..905c8f4d9f7efcf751f6e4597d4cb571e3eab7cc 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -4140,7 +4140,14 @@ 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__) && \
+    !defined(__OHOS__)
 #define SORTFUNC       versionsort64
 #else
 #define SORTFUNC       alphasort64

diff --git a/src/ucm/parser.c b/src/ucm/parser.c
index 488a5c621751c13335f11191a8c8b743db5fad2d..ac4a5fbcb52ef32d306987dd121a62b9828a3f48 100644 (file)
--- a/src/ucm/parser.c
+++ b/src/ucm/parser.c
@@ -2928,7 +2928,14 @@ 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__) && \
+    !defined(__OHOS__)
 #define SORTFUNC       versionsort64
 #else
 #define SORTFUNC       alphasort64