diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 22:29:22 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-01 22:29:22 +0000 |
| commit | bbf3608870ab60bcab09ab1a5277ac400f717632 (patch) | |
| tree | 043a5c172ecdcd82d75e99ab64e0fe88e05f486c /third_party | |
| parent | 114763165374387d645ab2ce7aa22fcd48d4adfe (diff) | |
| download | chromium_src-bbf3608870ab60bcab09ab1a5277ac400f717632.zip chromium_src-bbf3608870ab60bcab09ab1a5277ac400f717632.tar.gz chromium_src-bbf3608870ab60bcab09ab1a5277ac400f717632.tar.bz2 | |
Add je_memalign prototype.CQ can't commit this due to CrLf line endings, so land manually. See http://crbug.com/128744.
BUG=none
TBR=jar
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149516 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/jemalloc/chromium/jemalloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/third_party/jemalloc/chromium/jemalloc.c b/third_party/jemalloc/chromium/jemalloc.c index 65eb0b3..f19ba3b 100644 --- a/third_party/jemalloc/chromium/jemalloc.c +++ b/third_party/jemalloc/chromium/jemalloc.c @@ -6148,6 +6148,7 @@ malloc_shutdown() #define free(a) je_free(a)
#define _msize(p) je_msize(p)
#define _recalloc(p, n, s) je_recalloc(p, n, s)
+#define memalign(a, s) je_memalign(a, s)
#endif
ZONE_INLINE
|