| Index: webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
|
| diff --git a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
|
| index 4b3569cb9503b143c2631746495b2a3a42aec148..d62f00a822539323d379ee58c320cddddee42c2e 100644
|
| --- a/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
|
| +++ b/webrtc/modules/audio_device/linux/latebindingsymboltable_linux.h
|
| @@ -22,7 +22,8 @@
|
| // supports Linux and pure C symbols.
|
| // See talk/sound/pulseaudiosymboltable.(h|cc) for an example.
|
|
|
| -namespace webrtc_adm_linux {
|
| +namespace webrtc {
|
| +namespace adm_linux {
|
|
|
| #ifdef WEBRTC_LINUX
|
| typedef void *DllHandle;
|
| @@ -132,18 +133,19 @@ enum {
|
| ClassName##_SYMBOL_TABLE_INDEX_##sym,
|
|
|
| // This macro completes the header declaration.
|
| -#define LATE_BINDING_SYMBOL_TABLE_DECLARE_END(ClassName) \
|
| - ClassName##_SYMBOL_TABLE_SIZE \
|
| -}; \
|
| -\
|
| -extern const char ClassName##_kDllName[]; \
|
| -extern const char *const \
|
| - ClassName##_kSymbolNames[ClassName##_SYMBOL_TABLE_SIZE]; \
|
| -\
|
| -typedef ::webrtc_adm_linux::LateBindingSymbolTable<ClassName##_SYMBOL_TABLE_SIZE, \
|
| - ClassName##_kDllName, \
|
| - ClassName##_kSymbolNames> \
|
| - ClassName;
|
| +#define LATE_BINDING_SYMBOL_TABLE_DECLARE_END(ClassName) \
|
| + ClassName##_SYMBOL_TABLE_SIZE \
|
| + } \
|
| + ; \
|
| + \
|
| + extern const char ClassName##_kDllName[]; \
|
| + extern const char* const \
|
| + ClassName##_kSymbolNames[ClassName##_SYMBOL_TABLE_SIZE]; \
|
| + \
|
| + typedef ::webrtc::adm_linux::LateBindingSymbolTable< \
|
| + ClassName##_SYMBOL_TABLE_SIZE, ClassName##_kDllName, \
|
| + ClassName##_kSymbolNames> \
|
| + ClassName;
|
|
|
| // This macro must be invoked in a .cc file to define a previously-declared
|
| // symbol table class.
|
| @@ -170,6 +172,7 @@ const char *const ClassName##_kSymbolNames[ClassName##_SYMBOL_TABLE_SIZE] = {
|
| (*reinterpret_cast<typeof(&sym)>( \
|
| (inst)->GetSymbol(LATESYM_INDEXOF(ClassName, sym))))
|
|
|
| -} // namespace webrtc_adm_linux
|
| +} // namespace adm_linux
|
| +} // namespace webrtc
|
|
|
| #endif // WEBRTC_ADM_LATEBINDINGSYMBOLTABLE_LINUX_H
|
|
|