diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-12-20 16:34:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2019-12-20 16:45:11 +0100 |
| commit | 7fd7d6c5045113350fcf78e865ced8a80dbde9fb (patch) | |
| tree | ff77e7e8b0f457d2e9acf72a50cf2665ffac7792 | |
| parent | 4fa406caf950fd46ae06bccf9a4c72171401d203 (diff) | |
| download | linux-7fd7d6c5045113350fcf78e865ced8a80dbde9fb.tar.bz2 | |
ALSA: uapi: Fix typos and header inclusion in asound.h
The recent changes in uapi/asoundlib.h caused some build errors in
alsa-lib side because of a typo and the new included files.
Basically asound.h is supposed to be usable also on non-Linux systems,
so we've tried to avoid the Linux-specific include files.
This patch is an attempt to recover from those changes.
Fixes: 3ddee7f88aaf ("ALSA: Avoid using timespec for struct snd_pcm_status")
Fixes: 80fe7430c708 ("ALSA: add new 32-bit layout for snd_pcm_mmap_status/control")
Link: https://lore.kernel.org/r/20191220153415.2740-5-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | include/uapi/sound/asound.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/sound/asound.h b/include/uapi/sound/asound.h index e6a958b8aff1..e7943302359e 100644 --- a/include/uapi/sound/asound.h +++ b/include/uapi/sound/asound.h @@ -26,7 +26,9 @@ #if defined(__KERNEL__) || defined(__linux__) #include <linux/types.h> +#include <asm/byteorder.h> #else +#include <endian.h> #include <sys/ioctl.h> #endif @@ -35,8 +37,6 @@ #include <time.h> #endif -#include <asm/byteorder.h> - /* * protocol version */ @@ -471,7 +471,7 @@ enum { #ifndef __KERNEL__ /* explicit padding avoids incompatibility between i386 and x86-64 */ -typedef struct { unsigned char pad[sizeof(time_t) - sizeof(int)] __time_pad; +typedef struct { unsigned char pad[sizeof(time_t) - sizeof(int)]; } __time_pad; struct snd_pcm_status { snd_pcm_state_t state; /* stream state */ |