From fd0283eaa0fd593d73aab0be52038f3b6cb6c44b Mon Sep 17 00:00:00 2001 From: Greg Ward Date: Tue, 11 May 2004 01:34:55 +0000 Subject: [PATCH] SF #832236: merge from release23-maint branch: wrap a bunch of _EXPORT_INT calls in #ifdef's, to avoid breaking the build on MkLinux (Linux 2.0). --- Modules/ossaudiodev.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c index c53a08a873e..047355fb784 100644 --- a/Modules/ossaudiodev.c +++ b/Modules/ossaudiodev.c @@ -989,14 +989,30 @@ initossaudiodev(void) _EXPORT_INT(m, SOUND_MIXER_LINE1); _EXPORT_INT(m, SOUND_MIXER_LINE2); _EXPORT_INT(m, SOUND_MIXER_LINE3); +#ifdef SOUND_MIXER_DIGITAL1 _EXPORT_INT(m, SOUND_MIXER_DIGITAL1); +#endif +#ifdef SOUND_MIXER_DIGITAL2 _EXPORT_INT(m, SOUND_MIXER_DIGITAL2); +#endif +#ifdef SOUND_MIXER_DIGITAL3 _EXPORT_INT(m, SOUND_MIXER_DIGITAL3); +#endif +#ifdef SOUND_MIXER_PHONEIN _EXPORT_INT(m, SOUND_MIXER_PHONEIN); +#endif +#ifdef SOUND_MIXER_PHONEOUT _EXPORT_INT(m, SOUND_MIXER_PHONEOUT); +#endif +#ifdef SOUND_MIXER_VIDEO _EXPORT_INT(m, SOUND_MIXER_VIDEO); +#endif +#ifdef SOUND_MIXER_RADIO _EXPORT_INT(m, SOUND_MIXER_RADIO); +#endif +#ifdef SOUND_MIXER_MONITOR _EXPORT_INT(m, SOUND_MIXER_MONITOR); +#endif /* Expose all the ioctl numbers for masochists who like to do this stuff directly. */ @@ -1022,7 +1038,9 @@ initossaudiodev(void) _EXPORT_INT(m, SNDCTL_DSP_GETFMTS); _EXPORT_INT(m, SNDCTL_DSP_GETIPTR); _EXPORT_INT(m, SNDCTL_DSP_GETISPACE); +#ifdef SNDCTL_DSP_GETODELAY _EXPORT_INT(m, SNDCTL_DSP_GETODELAY); +#endif _EXPORT_INT(m, SNDCTL_DSP_GETOPTR); _EXPORT_INT(m, SNDCTL_DSP_GETOSPACE); #ifdef SNDCTL_DSP_GETSPDIF