From 099e61508eaaf2c5999e601f953f392f1aa37b70 Mon Sep 17 00:00:00 2001 From: Eric Laurent Date: Thu, 7 Feb 2013 11:31:48 -0800 Subject: [PATCH] audio effects: fix link problem with NULL UUID A special value for NULL effect UUID is declared as const in audio_effect.h. This prevents several modules including audio_effect.h to be linked together. The fix consists in declaring the value as static const. Change-Id: I86e74dc9da8eaed13a3ad44765abb9cd1e80f316 --- include/hardware/audio_effect.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/hardware/audio_effect.h b/include/hardware/audio_effect.h index 2c8f2e31..2940b1af 100644 --- a/include/hardware/audio_effect.h +++ b/include/hardware/audio_effect.h @@ -61,8 +61,9 @@ typedef struct effect_uuid_s { #define EFFECT_UUID_INITIALIZER { 0xec7178ec, 0xe5e1, 0x4432, 0xa3f4, \ { 0x46, 0x57, 0xe6, 0x79, 0x52, 0x10 } } static const effect_uuid_t EFFECT_UUID_NULL_ = EFFECT_UUID_INITIALIZER; -const effect_uuid_t * const EFFECT_UUID_NULL = &EFFECT_UUID_NULL_; -const char * const EFFECT_UUID_NULL_STR = "ec7178ec-e5e1-4432-a3f4-4657e6795210"; +static const effect_uuid_t * const EFFECT_UUID_NULL = &EFFECT_UUID_NULL_; +static const char * const EFFECT_UUID_NULL_STR = "ec7178ec-e5e1-4432-a3f4-4657e6795210"; + // The effect descriptor contains necessary information to facilitate the enumeration of the effect // engines present in a library.