ckolivas/lrzip
1
0
Fork 0
mirror of https://github.com/ckolivas/lrzip.git synced 2025-12-06 07:12:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for 32 bit limits and osx compilation.

Browse source
This commit is contained in:
Con Kolivas 2011-03-22 00:46:12 +11:00
parent c533b031bc
commit 93f7c602d0
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lrzip_private.h
View file

@ -95,7 +95,7 @@ typedef uint32_t u32;
typedef struct rzip_control rzip_control; typedef struct rzip_control rzip_control;
typedef struct md5_ctx md5_ctx; typedef struct md5_ctx md5_ctx;
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) #ifndef mremap
# define mremap fake_mremap # define mremap fake_mremap
#endif #endif

5
main.c
View file

@ -41,6 +41,7 @@
#include "rzip.h" #include "rzip.h"
#include "lrzip.h" #include "lrzip.h"
#include "util.h" #include "util.h"
#include "stream.h"
/* needed for CRC routines */ /* needed for CRC routines */
#include "lzma/C/7zCrc.h" #include "lzma/C/7zCrc.h"
@ -762,12 +763,12 @@ int main(int argc, char *argv[])
i64 usable_ram; i64 usable_ram;
/* Decrease usable ram size on 32 bits due to kernel / /* Decrease usable ram size on 32 bits due to kernel /
* userspace split. Cannot allocate larger than a 2 * userspace split. Cannot allocate larger than a 1
* gigabyte chunk due to 32 bit signed long being * gigabyte chunk due to 32 bit signed long being
* used in alloc */ * used in alloc */
usable_ram = MAX(control.ramsize - 900000000ll, 900000000ll); usable_ram = MAX(control.ramsize - 900000000ll, 900000000ll);
control.maxram = MIN(control.maxram, usable_ram); control.maxram = MIN(control.maxram, usable_ram);
control.maxram = MIN((unsigned long long)control.maxram, two_gig); control.maxram = MIN(control.maxram, one_g);
} }
round_to_page(&control.maxram); round_to_page(&control.maxram);