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.
Showing the changes to include/uapi (1 of 1 file). Show all
Unified · Split
| @@ -26,7 +26,9 @@ · 25 unmodified lines | |||
| 26 | 26 | ||
| 27 | #if defined(__KERNEL__) || defined(__linux__) | 27 | #if defined(__KERNEL__) || defined(__linux__) |
| 28 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 29 | #include <asm/byteorder.h> | ||
| 29 | #else | 30 | #else |
| 31 | #include <endian.h> | ||
| 30 | #include <sys/ioctl.h> | 32 | #include <sys/ioctl.h> |
| 31 | #endif | 33 | #endif |
| 32 | 34 | ||
| @@ -35,8 +37,6 @@ · 2 unmodified lines | |||
| 35 | #include <time.h> | 37 | #include <time.h> |
| 36 | #endif | 38 | #endif |
| 37 | 39 | ||
| 38 | #include <asm/byteorder.h> | ||
| 39 | |||
| 40 | /* | 40 | /* |
| 41 | * protocol version | 41 | * protocol version |
| 42 | */ | 42 | */ |
| @@ -471,7 +471,7 @@ enum { · 428 unmodified lines | |||
| 471 | 471 | ||
| 472 | #ifndef __KERNEL__ | 472 | #ifndef __KERNEL__ |
| 473 | /* explicit padding avoids incompatibility between i386 and x86-64 */ | 473 | /* explicit padding avoids incompatibility between i386 and x86-64 */ |
| 474 | typedef struct { unsigned char pad[sizeof(time_t) - sizeof(int)] __time_pad; | 474 | typedef struct { unsigned char pad[sizeof(time_t) - sizeof(int)]; } __time_pad; |
| 475 | 475 | ||
| 476 | struct snd_pcm_status { | 476 | struct snd_pcm_status { |
| 477 | snd_pcm_state_t state; /* stream state */ | 477 | snd_pcm_state_t state; /* stream state */ |