--- a/src/hpplay.c	Mon Aug 13 11:19:22 2007 +0200
+++ b/src/hpplay.c	Mon Aug 13 11:20:41 2007 +0200
@@ -51,8 +51,6 @@
 #include <config.h>
 #include "lisp.h"
 
-#include "nativesound.h"
-
 #include <stdlib.h>
 #include <stdio.h>
 #ifdef HPUX10
@@ -63,7 +61,6 @@
 #include <audio/CUlib.h>
 #endif /* !HPUX 10 */
 
-
 Lisp_Object Vhp_play_server;
 Lisp_Object Vhp_play_speaker;
 int         hp_play_gain;
@@ -205,11 +202,11 @@
 
     play_bucket_internal(audio, pSBucket, volume);
 
-    ASetErrorHandler(prevHandler);    
+    ASetErrorHandler(prevHandler);
 }
 
 
-int
+void
 play_sound_data (data, length, volume)
      unsigned char * data;
      int length;
@@ -221,17 +218,7 @@
     SunHeader       *header;
     long            status;
     char            *server;
-    int             result;
 
-    /* #### Finish this to return an error code.
-       This function signal a lisp error. How consistent with the rest.
-       What if this function is needed in doing the beep for the error?
-
-       Apparently the author of this didn't read the comment in
-       Fplay_sound.
-    */
-       
-    
     if (STRINGP (Vhp_play_server))
       server = (char *) XSTRING_DATA (Vhp_play_server);
     server = "";
@@ -263,8 +250,6 @@
     ASetErrorHandler(prevHandler);
     if (status)
       player_error_internal( audio, "Audio data copy failed", status );
-
-    return 1;
 }
 
 void