[Python-checkins] python/dist/src/Modules ossaudiodev.c,1.34,1.35

[gward at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27142/Modules

Modified Files:
	ossaudiodev.c 
Log Message:
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).


Index: ossaudiodev.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/ossaudiodev.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** ossaudiodev.c	2 Jun 2003 14:15:34 -0000	1.34
--- ossaudiodev.c	11 May 2004 01:34:55 -0000	1.35
***************
*** 990,1001 ****
--- 990,1017 ----
      _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
***************
*** 1023,1027 ****
--- 1039,1045 ----
      _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);