aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMihail Zenkov <mihail.zenkov@gmail.com>2013-04-02 11:59:20 +0000
committerTakashi Iwai <tiwai@suse.de>2013-04-03 11:35:29 +0200
commit2d2439017a600b36ee554027586c2eb9b2c28f31 (patch)
tree0cd9be6420215e6332ac9d6d751510b98420c8e0
parent9e6b52f148fb5a6352f441d0b5a41419c3a57c79 (diff)
downloadsalsa-lib-2d2439017a600b36ee554027586c2eb9b2c28f31.tar.gz
Fix error on jack compilation with salsa
Fix error on jack compilation with salsa: /usr/include/alsa/ctl_macros.h:251:48: error: invalid conversion from 'void*' to 'snd_ctl_elem_id_t* {aka snd_ctl_elem_id*}' [-fpermissive] Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r--src/ctl_macros.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ctl_macros.h b/src/ctl_macros.h
index 2bfd3a4..9ed3357 100644
--- a/src/ctl_macros.h
+++ b/src/ctl_macros.h
@@ -248,7 +248,7 @@ int snd_ctl_elem_list_alloc_space(snd_ctl_elem_list_t *obj,
unsigned int entries)
{
free(obj->pids);
- obj->pids = calloc(entries, sizeof(*obj->pids));
+ obj->pids = (snd_ctl_elem_id_t*)calloc(entries, sizeof(*obj->pids));
if (!obj->pids) {
obj->space = 0;
return -ENOMEM;