[alsa-devel] alsa-lib-1.0.15 : --disable-hwdep/--disable-rawmidi broken

[Takashi Iwai]

At Mon, 4 Feb 2008 14:48:01 +0000 (UTC),
Matthieu CASTET wrote:
> 
> hi,
> 
> If I compile alsa-lib-1.0.15 with --disable-hwdep or --disable-rawmidi, I get
> failure in include/alsa/control.h [1].
> 
> Matthieu
> 
> [1]
> In file included from ../../include/alsa/asoundlib.h:51,
>                  from simple_none.c:39:
> ../../include/alsa/control.h:246: error: expected declaration specifiers or
> '...' before 'snd_hwdep_info_t'
> ../../include/alsa/control.h:251: error: expected declaration specifiers or
> '...' before 'snd_rawmidi_info_t'
> make[3]: *** [simple_none.lo] Erreur 1
> make[3]: *** Attente des tâches non terminées....
> make[2]: *** [all-recursive] Erreur 1
> make[1]: *** [all-recursive] Erreur 1
> make: *** [alsa] Erreur 2

The patch below fixes, at least for 1.0.16rc2.


Takashi

diff -r ab22882fbf02 include/control.h
--- a/include/control.h	Mon Feb 04 15:59:07 2008 +0100
+++ b/include/control.h	Mon Feb 04 15:59:23 2008 +0100
@@ -242,14 +242,20 @@ int snd_ctl_elem_tlv_write(snd_ctl_t *ct
 			   const unsigned int *tlv);
 int snd_ctl_elem_tlv_command(snd_ctl_t *ctl, const snd_ctl_elem_id_t *id,
 			     const unsigned int *tlv);
+#ifdef __ALSA_HWDEP_H
 int snd_ctl_hwdep_next_device(snd_ctl_t *ctl, int * device);
 int snd_ctl_hwdep_info(snd_ctl_t *ctl, snd_hwdep_info_t * info);
+#endif
+#ifdef __ALSA_PCM_H
 int snd_ctl_pcm_next_device(snd_ctl_t *ctl, int *device);
 int snd_ctl_pcm_info(snd_ctl_t *ctl, snd_pcm_info_t * info);
 int snd_ctl_pcm_prefer_subdevice(snd_ctl_t *ctl, int subdev);
+#endif
+#ifdef __ALSA_RAWMIDI_H
 int snd_ctl_rawmidi_next_device(snd_ctl_t *ctl, int * device);
 int snd_ctl_rawmidi_info(snd_ctl_t *ctl, snd_rawmidi_info_t * info);
 int snd_ctl_rawmidi_prefer_subdevice(snd_ctl_t *ctl, int subdev);
+#endif
 int snd_ctl_set_power_state(snd_ctl_t *ctl, unsigned int state);
 int snd_ctl_get_power_state(snd_ctl_t *ctl, unsigned int *state);