summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/lzma/C/Alloc.c
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/lzma/C/Alloc.c')
-rw-r--r--3rdparty/lzma/C/Alloc.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/3rdparty/lzma/C/Alloc.c b/3rdparty/lzma/C/Alloc.c
index df7412afe79..3f6ac41918e 100644
--- a/3rdparty/lzma/C/Alloc.c
+++ b/3rdparty/lzma/C/Alloc.c
@@ -1,9 +1,9 @@
/* Alloc.c -- Memory allocation functions
-2008-09-24
-Igor Pavlov
-Public domain */
+2015-02-21 : Igor Pavlov : Public domain */
-#ifdef _WIN32_7Z
+#include "Precomp.h"
+
+#ifdef _WIN32
#include <windows.h>
#endif
#include <stdlib.h>
@@ -44,7 +44,7 @@ void MyFree(void *address)
free(address);
}
-#ifdef _WIN32_7Z
+#ifdef _WIN32
void *MidAlloc(size_t size)
{
@@ -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 };