| diff -ru alsa-lib-1.1.4.1.orig/include/asoundlib-head.h alsa-lib-1.1.4.1/include/asoundlib-head.h |
| |
| |
| @@ -35,6 +35,6 @@ |
| #include <string.h> |
| #include <fcntl.h> |
| #include <assert.h> |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include <errno.h> |
| #include <stdarg.h> |
| diff -ru alsa-lib-1.1.4.1.orig/include/local.h alsa-lib-1.1.4.1/include/local.h |
| |
| |
| @@ -47,7 +47,7 @@ |
| #error Header defining endianness not defined |
| #endif |
| #include <stdarg.h> |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include <sys/types.h> |
| #include <errno.h> |
| #if defined(__linux__) |
| @@ -254,8 +254,10 @@ |
| /* |
| */ |
| #define HAVE_GNU_LD |
| +#ifndef __midipix__ |
| #define HAVE_ELF |
| #define HAVE_ASM_PREVIOUS_DIRECTIVE |
| +#endif |
| |
| /* Stolen from libc-symbols.h in GNU glibc */ |
| |
| diff -ru alsa-lib-1.1.4.1.orig/include/sound/asoc.h alsa-lib-1.1.4.1/include/sound/asoc.h |
| |
| |
| @@ -300,12 +300,12 @@ |
| __le32 size; /* in bytes of this structure */ |
| __le32 id; /* unique ID - - used to match */ |
| __le32 fmt; /* SND_SOC_DAI_FORMAT_ format value */ |
| - __u8 clock_gated; /* 1 if clock can be gated to save power */ |
| - __u8 invert_bclk; /* 1 for inverted BCLK, 0 for normal */ |
| - __u8 invert_fsync; /* 1 for inverted frame clock, 0 for normal */ |
| - __u8 bclk_master; /* 1 for master of BCLK, 0 for slave */ |
| - __u8 fsync_master; /* 1 for master of FSYNC, 0 for slave */ |
| - __u8 mclk_direction; /* 0 for input, 1 for output */ |
| + uint8_t clock_gated; /* 1 if clock can be gated to save power */ |
| + uint8_t invert_bclk; /* 1 for inverted BCLK, 0 for normal */ |
| + uint8_t invert_fsync; /* 1 for inverted frame clock, 0 for normal */ |
| + uint8_t bclk_master; /* 1 for master of BCLK, 0 for slave */ |
| + uint8_t fsync_master; /* 1 for master of FSYNC, 0 for slave */ |
| + uint8_t mclk_direction; /* 0 for input, 1 for output */ |
| __le16 reserved; /* for 32bit alignment */ |
| __le32 mclk_rate; /* MCLK or SYSCLK freqency in Hz */ |
| __le32 bclk_rate; /* BCLK freqency in Hz */ |
| diff -ru alsa-lib-1.1.4.1.orig/src/control/control_shm.c alsa-lib-1.1.4.1/src/control/control_shm.c |
| |
| |
| @@ -27,7 +27,7 @@ |
| #include <fcntl.h> |
| #include <sys/shm.h> |
| #include <sys/socket.h> |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include <sys/un.h> |
| #include <sys/uio.h> |
| #include <sys/mman.h> |
| diff -ru alsa-lib-1.1.4.1.orig/src/pcm/pcm_direct.c alsa-lib-1.1.4.1/src/pcm/pcm_direct.c |
| |
| |
| @@ -30,7 +30,7 @@ |
| #include <grp.h> |
| #include <sys/ioctl.h> |
| #include <sys/mman.h> |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include <sys/shm.h> |
| #include <sys/sem.h> |
| #include <sys/wait.h> |
| diff -ru alsa-lib-1.1.4.1.orig/src/pcm/pcm_mmap.c alsa-lib-1.1.4.1/src/pcm/pcm_mmap.c |
| |
| |
| @@ -22,7 +22,7 @@ |
| #include <stdio.h> |
| #include <malloc.h> |
| #include <string.h> |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include <sys/mman.h> |
| #ifdef HAVE_SYS_SHM_H |
| #include <sys/shm.h> |
| diff -ru alsa-lib-1.1.4.1.orig/src/pcm/pcm_share.c alsa-lib-1.1.4.1/src/pcm/pcm_share.c |
| |
| |
| @@ -34,7 +34,7 @@ |
| #include <signal.h> |
| #include <math.h> |
| #include <sys/socket.h> |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include <pthread.h> |
| #include "pcm_local.h" |
| |
| diff -ru alsa-lib-1.1.4.1.orig/src/pcm/pcm_shm.c alsa-lib-1.1.4.1/src/pcm/pcm_shm.c |
| |
| |
| @@ -36,7 +36,7 @@ |
| #include <sys/ioctl.h> |
| #include <sys/shm.h> |
| #include <sys/socket.h> |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include <sys/un.h> |
| #include <sys/mman.h> |
| #include <netinet/in.h> |
| diff -ru alsa-lib-1.1.4.1.orig/src/seq/seq.c alsa-lib-1.1.4.1/src/seq/seq.c |
| |
| |
| @@ -777,7 +777,7 @@ |
| |
| */ |
| |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include "seq_local.h" |
| |
| / |
| diff -ru alsa-lib-1.1.4.1.orig/src/shmarea.c alsa-lib-1.1.4.1/src/shmarea.c |
| |
| |
| @@ -27,7 +27,7 @@ |
| #include <malloc.h> |
| #include <string.h> |
| #include <errno.h> |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include <sys/mman.h> |
| #include <sys/shm.h> |
| #include "list.h" |
| |
| |
| @@ -45,6 +45,8 @@ |
| #define use_default_symbol_version(real, name, version) \ |
| __asm__ (".weak " ASM_NAME(#name)); \ |
| __asm__ (ASM_NAME(#name) " = " ASM_NAME(#real)) |
| +#elif defined(__midipix__) |
| +#define use_default_symbol_version(real, name, version) /* nothing */ |
| #else |
| #define use_default_symbol_version(real, name, version) \ |
| __asm__ (".weak " ASM_NAME(#name)); \ |
| |
| |
| @@ -90,7 +90,7 @@ |
| #include <string.h> |
| #include <fcntl.h> |
| #include <signal.h> |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include <stdbool.h> |
| #include "control_local.h" |
| |
| @@ -2504,11 +2504,7 @@ |
| * \param obj CTL element id/info |
| * \return zero value if no dimensions are defined, otherwise positive value with count of dimensions |
| */ |
| -#ifndef DOXYGEN |
| -int INTERNAL(snd_ctl_elem_info_get_dimensions)(const snd_ctl_elem_info_t *obj) |
| -#else |
| int snd_ctl_elem_info_get_dimensions(const snd_ctl_elem_info_t *obj) |
| -#endif |
| { |
| int i; |
| |
| @@ -2526,11 +2522,7 @@ |
| * \param idx The dimension index |
| * \return zero value if no dimension width is defined, otherwise positive value with with of specified dimension |
| */ |
| -#ifndef DOXYGEN |
| -int INTERNAL(snd_ctl_elem_info_get_dimension)(const snd_ctl_elem_info_t *obj, unsigned int idx) |
| -#else |
| int snd_ctl_elem_info_get_dimension(const snd_ctl_elem_info_t *obj, unsigned int idx) |
| -#endif |
| { |
| assert(obj); |
| if (idx > 3) |
| |
| |
| @@ -736,11 +736,7 @@ |
| * \param params pointer to #snd_timer_params_t structure |
| * \param filter The event filter bits to set |
| */ |
| -#ifndef DOXYGEN |
| -void INTERNAL(snd_timer_params_set_filter)(snd_timer_params_t * params, unsigned int filter) |
| -#else |
| void snd_timer_params_set_filter(snd_timer_params_t * params, unsigned int filter) |
| -#endif |
| { |
| assert(params); |
| params->filter = filter; |
| |
| |
| @@ -651,7 +651,7 @@ |
| #include <stdarg.h> |
| #include <signal.h> |
| #include <ctype.h> |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include <sys/mman.h> |
| #include <limits.h> |
| #include "pcm_local.h" |
| |
| |
| @@ -20,7 +20,7 @@ |
| |
| #include <sys/shm.h> |
| #include <sys/socket.h> |
| -#include <sys/poll.h> |
| +#include <poll.h> |
| #include <sys/un.h> |
| #include <sys/uio.h> |
| #include <stdio.h> |
| @@ -473,7 +473,7 @@ |
| ctrl->result = snd_pcm_rewind(pcm, ctrl->u.rewind.frames); |
| break; |
| case SND_PCM_IOCTL_FORWARD: |
| - ctrl->result = snd_pcm_forward(pcm, ctrl->u.forward.frames); |
| + ctrl->result = INTERNAL(snd_pcm_forward(pcm, ctrl->u.forward.frames)); |
| break; |
| case SNDRV_PCM_IOCTL_LINK: |
| { |