From d4e075016f8b38ebe72a9996cf8ad8915f3ce983 Mon Sep 17 00:00:00 2001 From: Andrzej Kaczmarek Date: Wed, 22 Jan 2014 11:34:46 +0100 Subject: [PATCH] android/hal-audio: Rename sbc_init to avoid collision with libsbc --- android/hal-audio.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/hal-audio.c b/android/hal-audio.c index 2f6f8c2f7..f53dba034 100644 --- a/android/hal-audio.c +++ b/android/hal-audio.c @@ -56,7 +56,7 @@ struct sbc_data { }; static int sbc_get_presets(struct audio_preset *preset, size_t *len); -static int sbc_init(struct audio_preset *preset, void **codec_data); +static int sbc_codec_init(struct audio_preset *preset, void **codec_data); static int sbc_cleanup(void *codec_data); static int sbc_get_config(void *codec_data, struct audio_input_config *config); @@ -80,7 +80,7 @@ static const struct audio_codec audio_codecs[] = { .get_presets = sbc_get_presets, - .init = sbc_init, + .init = sbc_codec_init, .cleanup = sbc_cleanup, .get_config = sbc_get_config, } @@ -184,7 +184,7 @@ static int sbc_get_presets(struct audio_preset *preset, size_t *len) return i; } -static int sbc_init(struct audio_preset *preset, void **codec_data) +static int sbc_codec_init(struct audio_preset *preset, void **codec_data) { struct sbc_data *sbc_data; -- 2.47.3