sys/asoundlib.h:1: This header is deprecated

[Gerald Pfeifer]

On Sun, 4 Aug 2002, Gerald Pfeifer wrote:
>> On a SuSE Linux 8.0 box[1] I'm getting the following #warning a few times
>> while building the current CVS version of Wine:
>>
>>   In file included from alsa.h:23,
>>                    from audio.c:46:
>>   /usr/include/sys/asoundlib.h:1: warning: #warning This header is
>>   deprecated, use <alsa/asoundlib.h> instead.
> Hi Gerald, sys/asoundlib.h is the old 0.5 version header, and it seems
> that SuSE has added it just for backward compatibility.
>
> Can you try the attached patch? I had prepared it few days ago but I've
> forgot to submit it...

The direction of your patch is a good one, but there are some problems:

Index: dlls/winmm/winealsa/alsa.h
===================================================================
 #ifdef HAVE_SYS_ASOUNDLIB_H
 #include <sys/asoundlib.h>
 #endif
+#ifdef HAVE_ALSA_ASOUNDLIB_H
+#include <alsa/asoundlib.h>
+#endif

If both alsa/asoundlib.h and sys/asoundlib.h exist, only one of them
should be #included, namely alsa/asoundlib.h.

sys/asoundlib.h should be ignored in this case.

Index: dlls/winmm/winealsa/alsa.h
===================================================================
@@ -561,7 +561,11 @@
 dnl **** Check for ALSA ****
 AC_SUBST(ALSALIBS,"")
 AC_CHECK_HEADERS(sys/asoundlib.h)
-if test "$ac_cv_header_sys_asoundlib_h" = "yes"
+if test "$ac_cv_header_sys_asoundlib_h" = "no"
+then
+  AC_CHECK_HEADERS(alsa/asoundlib.h)
+fi
+if test "$ac_cv_header_sys_asoundlib_h" = "yes" -o
"$ac_cv_header_alsa_asoundlib_h" = "yes"

Similiar here: sys/asoundlib.h should be checked only if alsa/asoundlib.h
does not exists.

Gerald

PS: Are you going to submit an updated patch? (I'm currently not
subscribed to wine-devel; I'd appreciate explicit Cc:s.)