aboutsummaryrefslogtreecommitdiffstats
path: root/include/sound
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2009-02-25 18:51:39 -0500
committerIngo Molnar <mingo@elte.hu>2009-03-26 13:14:14 -0400
commit85efde6f4e0de9577256c5f0030088d3fd4347c1 (patch)
tree28d3f28213e3da05ab3d38ce3ec01f778b713c5e /include/sound
parent9d50638bae05ab7f62d700c9e4a83a1845cf9ef4 (diff)
make exported headers use strict posix types
A number of standard posix types are used in exported headers, which is not allowed if __STRICT_KERNEL_NAMES is defined. In order to get rid of the non-__STRICT_KERNEL_NAMES part and to make sane headers the default, we have to change them all to safe types. There are also still some leftovers in reiserfs_fs.h, elfcore.h and coda.h, but these files have not compiled in user space for a long time. This leaves out the various integer types ({u_,u,}int{8,16,32,64}_t), which we take care of separately. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> Cc: David Airlie <airlied@linux.ie> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Cc: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Cc: netdev@vger.kernel.org Cc: linux-ppp@vger.kernel.org Cc: Jaroslav Kysela <perex@perex.cz> Cc: Takashi Iwai <tiwai@suse.de> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/sound')
-rw-r--r--include/sound/asound.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sound/asound.h b/include/sound/asound.h
index 1c02ed1d7c4a..16684c5a608c 100644
--- a/include/sound/asound.h
+++ b/include/sound/asound.h
@@ -385,7 +385,7 @@ struct snd_pcm_sw_params {
385 385
386struct snd_pcm_channel_info { 386struct snd_pcm_channel_info {
387 unsigned int channel; 387 unsigned int channel;
388 off_t offset; /* mmap offset */ 388 __kernel_off_t offset; /* mmap offset */
389 unsigned int first; /* offset to first sample in bits */ 389 unsigned int first; /* offset to first sample in bits */
390 unsigned int step; /* samples distance in bits */ 390 unsigned int step; /* samples distance in bits */
391}; 391};
@@ -789,7 +789,7 @@ struct snd_ctl_elem_info {
789 snd_ctl_elem_type_t type; /* R: value type - SNDRV_CTL_ELEM_TYPE_* */ 789 snd_ctl_elem_type_t type; /* R: value type - SNDRV_CTL_ELEM_TYPE_* */
790 unsigned int access; /* R: value access (bitmask) - SNDRV_CTL_ELEM_ACCESS_* */ 790 unsigned int access; /* R: value access (bitmask) - SNDRV_CTL_ELEM_ACCESS_* */
791 unsigned int count; /* count of values */ 791 unsigned int count; /* count of values */
792 pid_t owner; /* owner's PID of this control */ 792 __kernel_pid_t owner; /* owner's PID of this control */
793 union { 793 union {
794 struct { 794 struct {
795 long min; /* R: minimum value */ 795 long min; /* R: minimum value */