A few uapi/sound/*.h headers have been corrected for recovering from the compile errors with the existing user-space code (alsa-lib) by the recent commits. OTOH, these introduced another regression, as now linux/types.h inclusion became mandatory for the uapi header checks. As a compromise, this patch re-adds linux/types.h inclusions again, but conditionally not to break other non-standard user-space stuff again.
Showing the changes to include/uapi (3 of 3 files). Show all
Unified · Split
| @@ -23,6 +23,10 @@ · 22 unmodified lines | ||
| 23 | 23 | #ifndef _UAPI__SOUND_EMU10K1_H |
| 24 | 24 | #define _UAPI__SOUND_EMU10K1_H |
| 25 | 25 | |
| 26 | +#ifdef __linux__ | |
| 27 | +#include <linux/types.h> | |
| 28 | +#endif | |
| 29 | + | |
| 26 | 30 | /* |
| 27 | 31 | * ---- FX8010 ---- |
| 28 | 32 | */ |
| @@ -20,6 +20,10 @@ · 19 unmodified lines | ||
| 20 | 20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 21 | 21 | */ |
| 22 | 22 | |
| 23 | +#ifdef __linux__ | |
| 24 | +#include <linux/types.h> | |
| 25 | +#endif | |
| 26 | + | |
| 23 | 27 | #define HDSP_MATRIX_MIXER_SIZE 2048 |
| 24 | 28 | |
| 25 | 29 | enum HDSP_IO_Type { |
| @@ -21,6 +21,10 @@ · 20 unmodified lines | ||
| 21 | 21 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
| 22 | 22 | */ |
| 23 | 23 | |
| 24 | +#ifdef __linux__ | |
| 25 | +#include <linux/types.h> | |
| 26 | +#endif | |
| 27 | + | |
| 24 | 28 | /* Maximum channels is 64 even on 56Mode you have 64playbacks to matrix */ |
| 25 | 29 | #define HDSPM_MAX_CHANNELS 64 |
| 26 | 30 | |