diff options
author | Scott Stone <tafoid@users.noreply.github.com> | 2012-07-24 09:34:43 +0000 |
---|---|---|
committer | Scott Stone <tafoid@users.noreply.github.com> | 2012-07-24 09:34:43 +0000 |
commit | 7bbd6e0cd2518d0f664f0e7bb36c1c77e25109e0 (patch) | |
tree | 17f74569aa535b992e0d202a5d24894aa17b9e1c /src/lib | |
parent | 4a037ecfeadb3a4c9b62d9a76cf6e6172b7b2589 (diff) |
Enable support building the bundled 7z library with a C++ compiler. [Markus Rathgeb]
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/lib7z/LzmaDec.h | 5 | ||||
-rw-r--r-- | src/lib/util/chdcodec.c | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/lib7z/LzmaDec.h b/src/lib/lib7z/LzmaDec.h index 7927acd0d4e..ad93b170fc0 100644 --- a/src/lib/lib7z/LzmaDec.h +++ b/src/lib/lib7z/LzmaDec.h @@ -224,6 +224,11 @@ SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, ELzmaStatus *status, ISzAlloc *alloc); +/* + * Why isn't there an interface to pass in the properties directly???? + */ +SRes LzmaDec_Allocate_MAME(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc); + #ifdef __cplusplus } #endif diff --git a/src/lib/util/chdcodec.c b/src/lib/util/chdcodec.c index a65ff8cde1f..054c1092ff7 100644 --- a/src/lib/util/chdcodec.c +++ b/src/lib/util/chdcodec.c @@ -47,9 +47,6 @@ #include "lib7z/LzmaDec.h" #include <new> -// function that should exist but doesn't in the official release -extern "C" SRes LzmaDec_Allocate_MAME(CLzmaDec *p, const CLzmaProps *propNew, ISzAlloc *alloc); - //************************************************************************** // GLOBAL VARIABLES |