mirror of
https://github.com/alsa-project/alsa-lib.git
synced 2026-02-05 04:06:34 -05:00
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>
This commit is contained in:
parent
a8afb0449c
commit
b40fcda7fb
3 changed files with 3 additions and 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))
|
if (!S_ISDIR(st.st_mode))
|
||||||
return config_file_open(root, fn);
|
return config_file_open(root, fn);
|
||||||
#ifndef DOC_HIDDEN
|
#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
|
#define SORTFUNC versionsort64
|
||||||
#else
|
#else
|
||||||
#define SORTFUNC alphasort64
|
#define SORTFUNC alphasort64
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#if !defined(__OpenBSD__) && !defined(__DragonFly__)
|
#if !defined(__OpenBSD__) && !defined(__DragonFly__) && !defined(__ANDROID__)
|
||||||
union semun {
|
union semun {
|
||||||
int val; /* Value for SETVAL */
|
int val; /* Value for SETVAL */
|
||||||
struct semid_ds *buf; /* Buffer for IPC_STAT, IPC_SET */
|
struct semid_ds *buf; /* Buffer for IPC_STAT, IPC_SET */
|
||||||
|
|
|
||||||
|
|
@ -2915,7 +2915,7 @@ int uc_mgr_scan_master_configs(const char **_list[])
|
||||||
snprintf(filename, sizeof(filename), "%s/ucm2/conf.virt.d",
|
snprintf(filename, sizeof(filename), "%s/ucm2/conf.virt.d",
|
||||||
snd_config_topdir());
|
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
|
#define SORTFUNC versionsort64
|
||||||
#else
|
#else
|
||||||
#define SORTFUNC alphasort64
|
#define SORTFUNC alphasort64
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue