comments for a fix for wine/dlls/wineoss.drv/mixer.c for Solaris

On a current git tree, I noticed some variables falling out as undefined for 
Solaris Express/Build 61 and OpenSound System 4.0 v1002.  I patched it
the following way, but because I haven't played with sound before, wanted
to get some comments on whether or not there is a better fix (or a better
#ifdef to use).

With this patch, I was able to hear audio from Grand Theft Auto 2.

Thanks,

Ben

--- wine.ORIG/dlls/wineoss.drv/mixer.c  2007-04-21 16:43:39.000000000 -0400
+++ wine-git/dlls/wineoss.drv/mixer.c   2007-04-21 17:45:33.655890000 -0400
@@ -159,11 +159,15 @@
     IOCTL_TO_STR(SOUND_MIXER_DIGITAL1);
     IOCTL_TO_STR(SOUND_MIXER_DIGITAL2);
     IOCTL_TO_STR(SOUND_MIXER_DIGITAL3);
+#ifndef __sun__
     IOCTL_TO_STR(SOUND_MIXER_PHONEIN);
     IOCTL_TO_STR(SOUND_MIXER_PHONEOUT);
+#endif
     IOCTL_TO_STR(SOUND_MIXER_VIDEO);
     IOCTL_TO_STR(SOUND_MIXER_RADIO);
+#ifndef __sun__
     IOCTL_TO_STR(SOUND_MIXER_MONITOR);
+#endif
     }
 #undef IOCTL_TO_STR
     sprintf(str, "UNKNOWN(%08x)", command);

[Dmitry Timoshkov]

<sol11x86(a)comcast.net> wrote:
> +#ifndef __sun__
>     IOCTL_TO_STR(SOUND_MIXER_PHONEIN);
>     IOCTL_TO_STR(SOUND_MIXER_PHONEOUT);
> +#endif
>     IOCTL_TO_STR(SOUND_MIXER_VIDEO);
>     IOCTL_TO_STR(SOUND_MIXER_RADIO);
> +#ifndef __sun__
>     IOCTL_TO_STR(SOUND_MIXER_MONITOR);
> +#endif

There is no need in introducing a platform specific code:

#ifdef SOUND_MIXER_PHONEIN
    IOCTL_TO_STR(SOUND_MIXER_PHONEIN);
#endif
#ifdef SOUND_MIXER_PHONEOUT
    IOCTL_TO_STR(SOUND_MIXER_PHONEOUT);
#endif
    IOCTL_TO_STR(SOUND_MIXER_VIDEO);
    IOCTL_TO_STR(SOUND_MIXER_RADIO);
#ifdef SOUND_MIXER_MONITOR
    IOCTL_TO_STR(SOUND_MIXER_MONITOR);
#endif

should work just fine.

-- 
Dmitry.