CVS: rdesktop rdpsnd_alsa.c, 1.12, 1.13 rdpsnd_oss.c, 1.32, 1.33 rdpsnd_sgi.c, 1.18, 1.19 rdpsnd_sun.c, 1.26, 1.27

Update of /cvsroot/rdesktop/rdesktop
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv1971

Modified Files:
	rdpsnd_alsa.c rdpsnd_oss.c rdpsnd_sgi.c rdpsnd_sun.c 
Log Message:
Make code compile with C89 compilers again


Index: rdpsnd_alsa.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_alsa.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** rdpsnd_alsa.c	7 Dec 2006 15:23:45 -0000	1.12
--- rdpsnd_alsa.c	24 Dec 2006 13:52:08 -0000	1.13
***************
*** 338,361 ****
  }
  
! static struct audio_driver alsa_driver = {
! 	.name = "alsa",
! 	.description = "ALSA output driver, default device: " DEFAULTDEVICE,
  
! 	.add_fds = alsa_add_fds,
! 	.check_fds = alsa_check_fds,
  
! 	.wave_out_open = alsa_open,
! 	.wave_out_close = alsa_close,
! 	.wave_out_format_supported = alsa_format_supported,
! 	.wave_out_set_format = alsa_set_format,
! 	.wave_out_volume = rdpsnd_dsp_softvol_set,
  
! 	.need_byteswap_on_be = 0,
! 	.need_resampling = 0,
! };
  
- struct audio_driver *
- alsa_register(char *options)
- {
  	if (options)
  	{
--- 338,361 ----
  }
  
! struct audio_driver *
! alsa_register(char *options)
! {
! 	static struct audio_driver alsa_driver;
  
! 	alsa_driver.name = xstrdup("alsa");
! 	alsa_driver.description = xstrdup("ALSA output driver, default device: " DEFAULTDEVICE);
  
! 	alsa_driver.add_fds = alsa_add_fds;
! 	alsa_driver.check_fds = alsa_check_fds;
  
! 	alsa_driver.wave_out_open = alsa_open;
! 	alsa_driver.wave_out_close = alsa_close;
! 	alsa_driver.wave_out_format_supported = alsa_format_supported;
! 	alsa_driver.wave_out_set_format = alsa_set_format;
! 	alsa_driver.wave_out_volume = rdpsnd_dsp_softvol_set;
! 
! 	alsa_driver.need_byteswap_on_be = 0;
! 	alsa_driver.need_resampling = 0;
  
  	if (options)
  	{

Index: rdpsnd_oss.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_oss.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** rdpsnd_oss.c	7 Dec 2006 15:23:45 -0000	1.32
--- rdpsnd_oss.c	24 Dec 2006 13:52:08 -0000	1.33
***************
*** 317,340 ****
  }
  
! static struct audio_driver oss_driver = {
! 	.name = "oss",
! 	.description = "OSS output driver, default device: " DEFAULTDEVICE " or $AUDIODEV",
  
! 	.add_fds = oss_add_fds,
! 	.check_fds = oss_check_fds,
  
! 	.wave_out_open = oss_open,
! 	.wave_out_close = oss_close,
! 	.wave_out_format_supported = oss_format_supported,
! 	.wave_out_set_format = oss_set_format,
! 	.wave_out_volume = oss_volume,
  
! 	.need_byteswap_on_be = 0,
! 	.need_resampling = 0,
! };
  
- struct audio_driver *
- oss_register(char *options)
- {
  	if (options)
  	{
--- 317,339 ----
  }
  
! struct audio_driver *
! oss_register(char *options)
! {
! 	oss_driver.name = xstrdup("oss");
! 	oss_driver.description =
! 		xstrdup("OSS output driver, default device: " DEFAULTDEVICE " or $AUDIODEV");
  
! 	oss_driver.add_fds = oss_add_fds;
! 	oss_driver.check_fds = oss_check_fds;
  
! 	oss_driver.wave_out_open = oss_open;
! 	oss_driver.wave_out_close = oss_close;
! 	oss_driver.wave_out_format_supported = oss_format_supported;
! 	oss_driver.wave_out_set_format = oss_set_format;
! 	oss_driver.wave_out_volume = oss_volume;
  
! 	oss_driver.need_byteswap_on_be = 0;
! 	oss_driver.need_resampling = 0;
  
  	if (options)
  	{

Index: rdpsnd_sgi.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_sgi.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** rdpsnd_sgi.c	7 Dec 2006 15:23:45 -0000	1.18
--- rdpsnd_sgi.c	24 Dec 2006 13:52:08 -0000	1.19
***************
*** 288,311 ****
  }
  
! static struct audio_driver sgi_driver = {
! 	.name = "sgi",
! 	.description = "SGI output driver",
  
! 	.add_fds = sgi_add_fds,
! 	.check_fds = sgi_check_fds,
  
! 	.wave_out_open = sgi_open,
! 	.wave_out_close = sgi_close,
! 	.wave_out_format_supported = sgi_format_supported,
! 	.wave_out_set_format = sgi_set_format,
! 	.wave_out_volume = sgi_volume,
  
! 	.need_byteswap_on_be = 1,
! 	.need_resampling = 0,
! };
  
- struct audio_driver *
- sgi_register(char *options)
- {
  	if (options)
  	{
--- 288,311 ----
  }
  
! struct audio_driver *
! sgi_register(char *options)
! {
! 	static struct audio_driver sgi_driver;
  
! 	sgi_driver.name = xstrdup("sgi");
! 	sgi_driver.description = xstrdup("SGI output driver");
  
! 	sgi_driver.add_fds = sgi_add_fds;
! 	sgi_driver.check_fds = sgi_check_fds;
  
! 	sgi_driver.wave_out_open = sgi_open;
! 	sgi_driver.wave_out_close = sgi_close;
! 	sgi_driver.wave_out_format_supported = sgi_format_supported;
! 	sgi_driver.wave_out_set_format = sgi_set_format;
! 	sgi_driver.wave_out_volume = sgi_volume;
! 
! 	sgi_driver.need_byteswap_on_be = 1;
! 	sgi_driver.need_resampling = 0;
  
  	if (options)
  	{

Index: rdpsnd_sun.c
===================================================================
RCS file: /cvsroot/rdesktop/rdesktop/rdpsnd_sun.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** rdpsnd_sun.c	7 Dec 2006 16:41:58 -0000	1.26
--- rdpsnd_sun.c	24 Dec 2006 13:52:08 -0000	1.27
***************
*** 265,288 ****
  }
  
! static struct audio_driver sun_driver = {
! 	.name = "sun",
! 	.description = "SUN/BSD output driver, default device: " DEFAULTDEVICE " or $AUDIODEV",
  
! 	.add_fds = sun_add_fds,
! 	.check_fds = sun_check_fds,
  
! 	.wave_out_open = sun_open,
! 	.wave_out_close = sun_close,
! 	.wave_out_format_supported = sun_format_supported,
! 	.wave_out_set_format = sun_set_format,
! 	.wave_out_volume = sun_volume,
  
! 	.need_byteswap_on_be = 1,
! 	.need_resampling = 0,
! };
  
- struct audio_driver *
- sun_register(char *options)
- {
  	if (options)
  	{
--- 265,289 ----
  }
  
! struct audio_driver *
! sun_register(char *options)
! {
! 	static struct audio_driver sun_driver;
  
! 	sun_driver.name = xstrdup("sun");
! 	sun_driver.description =
! 		xstrdup("SUN/BSD output driver, default device: " DEFAULTDEVICE " or $AUDIODEV");
  
! 	sun_driver.add_fds = sun_add_fds;
! 	sun_driver.check_fds = sun_check_fds;
  
! 	sun_driver.wave_out_open = sun_open;
! 	sun_driver.wave_out_close = sun_close;
! 	sun_driver.wave_out_format_supported = sun_format_supported;
! 	sun_driver.wave_out_set_format = sun_set_format;
! 	sun_driver.wave_out_volume = sun_volume;
! 
! 	sun_driver.need_byteswap_on_be = 1;
! 	sun_driver.need_resampling = 0;
  
  	if (options)
  	{


-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV