summaryrefslogtreecommitdiffstats
path: root/sys/dev/sound
diff options
context:
space:
mode:
authorariff <ariff@FreeBSD.org>2006-09-30 01:24:22 +0000
committerariff <ariff@FreeBSD.org>2006-09-30 01:24:22 +0000
commitcbd0a8935f0630f3bc951a220e62ee0b4fbbab01 (patch)
tree4779dca9184f53a0561b926c2517c3184d1ed193 /sys/dev/sound
parentba8135e75adc40e45a4335d271169fec30e4f1b5 (diff)
downloadFreeBSD-src-cbd0a8935f0630f3bc951a220e62ee0b4fbbab01.zip
FreeBSD-src-cbd0a8935f0630f3bc951a220e62ee0b4fbbab01.tar.gz
Nuke OSSV4_EXPERIMENT ifdefs from kludgy MIXER_SIZE definition
since the exclusion of sizeof(oss_mixer_enuminfo) is the real cause of overflow (worth of +3000 bytes). Noticed by: tegge
Diffstat (limited to 'sys/dev/sound')
-rw-r--r--sys/dev/sound/pcm/mixer.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/sys/dev/sound/pcm/mixer.h b/sys/dev/sound/pcm/mixer.h
index 65a4178..09f4b60 100644
--- a/sys/dev/sound/pcm/mixer.h
+++ b/sys/dev/sound/pcm/mixer.h
@@ -52,11 +52,7 @@ extern int mixer_count;
* this is a kludge to allow hiding of the struct snd_mixer definition
* 512 should be enough for all architectures
*/
-#ifdef OSSV4_EXPERIMENT
# define MIXER_SIZE (512 + sizeof(struct kobj) + \
sizeof(oss_mixer_enuminfo))
-#else
-# define MIXER_SIZE (512 + sizeof(struct kobj))
-#endif
#define MIXER_DECLARE(name) static DEFINE_CLASS(name, name ## _methods, MIXER_SIZE)
OpenPOWER on IntegriCloud