Chromium Code Reviews

Unified Diff: third_party/libjingle/overrides/allocator_shim/allocator_stub.h

Issue 17569006: Support using loadable module for libpeerconnection on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: code review Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Index: third_party/libjingle/overrides/allocator_shim/allocator_stub.h
===================================================================
--- third_party/libjingle/overrides/allocator_shim/allocator_stub.h (revision 208133)
+++ third_party/libjingle/overrides/allocator_shim/allocator_stub.h (working copy)
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
-#if !defined(OS_MACOSX)
+#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
typedef void* (*AllocateFunction)(std::size_t);
typedef void (*DellocateFunction)(void*);
@@ -19,6 +19,6 @@
void* Allocate(std::size_t n);
void Dellocate(void* p);
-#endif // OS_MACOSX
+#endif // OS_MACOSX && OS_ANDROID
#endif // THIRD_PARTY_LIBJINGLE_OVERRIDES_ALLOCATOR_SHIM_ALLOCATOR_STUB_H_

Powered by Google App Engine