| commit | 802a568f77b9a372537e4216b2a7cbb203958a87 | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@google.com> | Fri Mar 13 15:38:23 2015 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Mar 13 15:38:35 2015 +0000 |
| tree | a31c7160aef56063ee1769fe271432580e6bc3d2 | |
| parent | c84eb736fd051c37e1d7e8585d14612713388a58 [diff] | |
| parent | ec8930f218fa0c1acde631543b40b5a0b28bfe1f [diff] |
Merge "Fix warning while building mediaserver"
diff --git a/include/media/stagefright/foundation/ABase.h b/include/media/stagefright/foundation/ABase.h index 72e3d87..ef1e010 100644 --- a/include/media/stagefright/foundation/ABase.h +++ b/include/media/stagefright/foundation/ABase.h
@@ -18,7 +18,9 @@ #define A_BASE_H_ +#ifndef ARRAY_SIZE #define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a))) +#endif #define DISALLOW_EVIL_CONSTRUCTORS(name) \ name(const name &); \
diff --git a/services/audiopolicy/managerdefault/ConfigParsingUtils.h b/services/audiopolicy/managerdefault/ConfigParsingUtils.h index 7969661..b2d9763 100644 --- a/services/audiopolicy/managerdefault/ConfigParsingUtils.h +++ b/services/audiopolicy/managerdefault/ConfigParsingUtils.h
@@ -26,7 +26,9 @@ }; #define STRING_TO_ENUM(string) { #string, string } +#ifndef ARRAY_SIZE #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) +#endif const StringToEnum sDeviceNameToEnumTable[] = { STRING_TO_ENUM(AUDIO_DEVICE_OUT_EARPIECE),