Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 17647002: Fix check_perms for r208246 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/libjingle/overrides/allocator_shim/allocator_proxy.cc ('k') | third_party/libjingle/overrides/allocator_shim/allocator_stub.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/libjingle/overrides/allocator_shim/allocator_stub.h
===================================================================
--- third_party/libjingle/overrides/allocator_shim/allocator_stub.h (revision 208299)
+++ 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_
« no previous file with comments | « third_party/libjingle/overrides/allocator_shim/allocator_proxy.cc ('k') | third_party/libjingle/overrides/allocator_shim/allocator_stub.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698