--- sourceforge.net/trunk/rdesktop/rdpsnd_sgi.c	2006/10/27 12:29:05	1304
+++ sourceforge.net/trunk/rdesktop/rdpsnd_sgi.c	2006/12/07 11:54:29	1345
@@ -273,23 +273,24 @@
 	}
 }
 
+static struct audio_driver sgi_driver = {
+	.name = "sgi",
+	.description = "SGI output driver",
+
+	.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,
+	.wave_out_play = sgi_play,
+
+	.need_byteswap_on_be = 1,
+	.need_resampling = 0,
+};
+
 struct audio_driver *
 sgi_register(char *options)
 {
-	static struct audio_driver sgi_driver;
-
-	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.wave_out_play = sgi_play;
-	sgi_driver.name = xstrdup("sgi");
-	sgi_driver.description = xstrdup("SGI output driver");
-	sgi_driver.need_byteswap_on_be = 1;
-	sgi_driver.need_resampling = 0;
-	sgi_driver.next = NULL;
-
 	if (options)
 	{
 		sgi_output_device = xstrdup(options);