diff options
| author | DLL125 <134442578+DLL125@users.noreply.github.com> | 2023-06-23 21:19:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-23 21:19:50 +0200 |
| commit | 097cfa947e068bcfc439cd466e53361d7f6d1b46 (patch) | |
| tree | 83b0399b71529b2847c78ae20d45b100651a9cbc /src/Common/lzma/Alloc.h | |
| parent | 9e1c0e5b22e6b668440c7e738cbd6cd9f651ddef (diff) | |
| download | VeraCrypt-097cfa947e068bcfc439cd466e53361d7f6d1b46.tar.gz VeraCrypt-097cfa947e068bcfc439cd466e53361d7f6d1b46.zip | |
Dll125 lzma (#1120)
* Update LZMA to latest
* Add missing file
Diffstat (limited to 'src/Common/lzma/Alloc.h')
| -rw-r--r-- | src/Common/lzma/Alloc.h | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/Common/lzma/Alloc.h b/src/Common/lzma/Alloc.h index 3be2041e..fac5b62f 100644 --- a/src/Common/lzma/Alloc.h +++ b/src/Common/lzma/Alloc.h @@ -1,19 +1,32 @@ /* Alloc.h -- Memory allocation functions -2021-07-13 : Igor Pavlov : Public domain */ +2023-03-04 : Igor Pavlov : Public domain */ -#ifndef __COMMON_ALLOC_H -#define __COMMON_ALLOC_H +#ifndef ZIP7_INC_ALLOC_H +#define ZIP7_INC_ALLOC_H #include "7zTypes.h" EXTERN_C_BEGIN +/* + MyFree(NULL) : is allowed, as free(NULL) + MyAlloc(0) : returns NULL : but malloc(0) is allowed to return NULL or non_NULL + MyRealloc(NULL, 0) : returns NULL : but realloc(NULL, 0) is allowed to return NULL or non_NULL +MyRealloc() is similar to realloc() for the following cases: + MyRealloc(non_NULL, 0) : returns NULL and always calls MyFree(ptr) + MyRealloc(NULL, non_ZERO) : returns NULL, if allocation failed + MyRealloc(non_NULL, non_ZERO) : returns NULL, if reallocation failed +*/ + void *MyAlloc(size_t size); void MyFree(void *address); +void *MyRealloc(void *address, size_t size); #ifdef _WIN32 +#ifdef Z7_LARGE_PAGES void SetLargePageSize(void); +#endif void *MidAlloc(size_t size); void MidFree(void *address); |