xserver: Branch 'master'

[Alan Coopersmith]

 hw/xfree86/os-support/solaris/sun_bell.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

New commits:
diff-tree 82912ad7709e8cf4a5f8a9fa6b47f789842a3fe9 (from 8956f63a941bf0a5f157d47b33e6221601a75040)
Author: Alan Coopersmith <alan.coopersmith at sun.com>
Date:   Thu Nov 30 20:13:52 2006 -0800

    Make solaris version of xf86OSRingBell return void like other OS'es

diff --git a/hw/xfree86/os-support/solaris/sun_bell.c b/hw/xfree86/os-support/solaris/sun_bell.c
index b3a9bfe..29ecd73 100644
--- a/hw/xfree86/os-support/solaris/sun_bell.c
+++ b/hw/xfree86/os-support/solaris/sun_bell.c
@@ -48,7 +48,7 @@
 
 #define AUDIO_DEVICE    "/dev/audio"
 
-_X_EXPORT int
+_X_EXPORT void
 xf86OSRingBell(int loudness, int pitch, int duration)
 {
     static short    samples[BELL_SAMPLES];
@@ -66,7 +66,7 @@ xf86OSRingBell(int loudness, int pitch, 
     int             audioFD;
 
     if ((loudness <= 0) || (pitch <= 0) || (duration <= 0)) {
-        return 0;
+        return;
     }
 
     lastFreq = 0;
@@ -76,7 +76,7 @@ xf86OSRingBell(int loudness, int pitch, 
     if (audioFD == -1) {
         xf86Msg(X_ERROR, "Bell: cannot open audio device \"%s\": %s\n",
                 AUDIO_DEVICE, strerror(errno));
-        return -1;
+        return;
     }
 
     freq = pitch;
@@ -126,7 +126,7 @@ xf86OSRingBell(int loudness, int pitch, 
                 "Bell: AUDIO_SETINFO failed on audio device \"%s\": %s\n",
                 AUDIO_DEVICE, strerror(errno));
         close(audioFD);
-        return -1;
+        return;
     }
 
     iovcnt = 0;
@@ -155,7 +155,7 @@ xf86OSRingBell(int loudness, int pitch, 
                                "Bell: writev failed on audio device \"%s\": %s\n",
                                 AUDIO_DEVICE, strerror(errno));
                         close(audioFD);
-                        return -1;
+                        return;
                     }
                     i = iovcnt;
                 } else {
@@ -181,5 +181,5 @@ xf86OSRingBell(int loudness, int pitch, 
     }
 
     close(audioFD);
-    return 0;
+    return;
 }