diff options
| author |   Thomas Klausner <wiz@NetBSD.org> | 2016-03-03 16:28:22 +0100 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2016-03-04 10:50:48 +0100 |
| commit | 59e4282717cb2adbfd12314ff484669a85827412 (patch) | |
| tree | 40c3e53348f0470c0fea82bd9e70e5be9c8463ad /include/uapi/sound | |
| parent | Merge branch 'for-linus' into for-next (diff) | |
| download | linux-dev-59e4282717cb2adbfd12314ff484669a85827412.tar.xz linux-dev-59e4282717cb2adbfd12314ff484669a85827412.zip | |
ALSA: uapi: Make alsa asound.h header more portable
This header is used as-is in the alsa-lib userland library,
which is portable to other operating systems.
For this reason, include linux/types.h only on Linux systems.
Add sys/ioctl.h for _IOR/_IOW/etc. (works at least on *BSD and Solaris).
Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/uapi/sound')
| -rw-r--r-- | include/uapi/sound/asound.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index a82108e5d1c0..67bf49d8c944 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -23,7 +23,11 @@ #ifndef _UAPI__SOUND_ASOUND_H #define _UAPI__SOUND_ASOUND_H +#if defined(__KERNEL__) || defined(__linux__) #include <linux/types.h> +#else +#include <sys/ioctl.h> +#endif #ifndef __KERNEL__ #include <stdlib.h> |