summaryrefslogtreecommitdiffstats
path: root/third_party/lzma_sdk/Alloc.c
diff options
context:
space:
mode:
authorgrt <grt@chromium.org>2016-02-17 06:57:09 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-17 14:58:24 +0000
commit763eb51e83e036c280c294d97c19f1c82f54ba72 (patch)
treef38ecc4e4c589fca34b33ba061745b65b4730d8f /third_party/lzma_sdk/Alloc.c
parent0a31af4f3f767583bcc3c854ccdb85cf20fc79bb (diff)
downloadchromium_src-763eb51e83e036c280c294d97c19f1c82f54ba72.zip
chromium_src-763eb51e83e036c280c294d97c19f1c82f54ba72.tar.gz
chromium_src-763eb51e83e036c280c294d97c19f1c82f54ba72.tar.bz2
Update lzma_sdk sources to 15.14.
BUG=586201 Review URL: https://codereview.chromium.org/1700453002 Cr-Commit-Position: refs/heads/master@{#375883}
Diffstat (limited to 'third_party/lzma_sdk/Alloc.c')
-rw-r--r--third_party/lzma_sdk/Alloc.c15
1 files changed, 12 insertions, 3 deletions
diff --git a/third_party/lzma_sdk/Alloc.c b/third_party/lzma_sdk/Alloc.c
index 358a7b5..3f6ac41 100644
--- a/third_party/lzma_sdk/Alloc.c
+++ b/third_party/lzma_sdk/Alloc.c
@@ -1,7 +1,7 @@
/* Alloc.c -- Memory allocation functions
-2008-09-24
-Igor Pavlov
-Public domain */
+2015-02-21 : Igor Pavlov : Public domain */
+
+#include "Precomp.h"
#ifdef _WIN32
#include <windows.h>
@@ -125,3 +125,12 @@ void BigFree(void *address)
}
#endif
+
+
+static void *SzAlloc(void *p, size_t size) { UNUSED_VAR(p); return MyAlloc(size); }
+static void SzFree(void *p, void *address) { UNUSED_VAR(p); MyFree(address); }
+ISzAlloc g_Alloc = { SzAlloc, SzFree };
+
+static void *SzBigAlloc(void *p, size_t size) { UNUSED_VAR(p); return BigAlloc(size); }
+static void SzBigFree(void *p, void *address) { UNUSED_VAR(p); BigFree(address); }
+ISzAlloc g_BigAlloc = { SzBigAlloc, SzBigFree };