--- a/src/sunplay.c	Mon Aug 13 11:12:06 2007 +0200
+++ b/src/sunplay.c	Mon Aug 13 11:13:30 2007 +0200
@@ -33,14 +33,8 @@
 #include <sys/fcntl.h>
 #include <sys/file.h>
 
-/* libaudio.h includes a header which defines CONST.  We temporarily
-   undefine it in order to eliminate a compiler warning.  Yes, this is
-   a gross hack. */
-#undef CONST
 #include <multimedia/libaudio.h>
 #include <multimedia/audio_device.h>
-#undef CONST
-#define CONST const
 
 #ifdef emacs
 # include <config.h>
@@ -312,7 +306,7 @@
 
 /* #### sigcontext doesn't exist in Solaris.  This should be updated
    to be correct for Solaris. */
-static void
+static SIGTYPE
 sighandler (int sig)
 {
   if (audio_fd > 0)