mars_nwe/mars-flaim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FTK changes. Updates for Solaris.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/flaim/code/trunk@853 0109f412-320b-0410-ab79-c3e0c5ffbbe6
This commit is contained in:
ahodgkinson
2006-09-18 14:33:13 +00:00
parent 8222c9ddc9
commit 2bf270fcfb
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ftk/Makefile
View File

@@ -69,7 +69,7 @@ ifneq (,$(findstring rpm,$(MAKECMDGOALS)))
endif
endif
ifneq (,$(findstring deb,$(MAKECMDGOALS)))
ifneq (,$(findstring debpkg,$(MAKECMDGOALS)))
calc_svn_revision = 1
ifndef ignore_local_mods
local_mods_ok =

12
ftk/src/ftkmem.cpp
View File

@@ -4980,11 +4980,11 @@ RCODE FLMAPI f_getMemoryInfo(
if( getrlimit( RLIMIT_VMEM, &rlim) != 0)
{
rlim.rlim_cur = RLIM_INFINITY;
rlim.rlim_max = RLIM_INFINITY;
rlim.rlim_cur = (rlim_t)RLIM_INFINITY;
rlim.rlim_max = (rlim_t)RLIM_INFINITY;
}
if( rlim.rlim_cur != RLIM_INFINITY)
if( rlim.rlim_cur != (rlim_t)RLIM_INFINITY)
{
uiProcVMemLimit = (FLMUINT)rlim.rlim_cur;
}
@@ -4997,11 +4997,11 @@ RCODE FLMAPI f_getMemoryInfo(
if( getrlimit( RLIMIT_DATA, &rlim) != 0)
{
rlim.rlim_cur = RLIM_INFINITY;
rlim.rlim_max = RLIM_INFINITY;
rlim.rlim_cur = (rlim_t)RLIM_INFINITY;
rlim.rlim_max = (rlim_t)RLIM_INFINITY;
}
if( rlim.rlim_cur != RLIM_INFINITY)
if( rlim.rlim_cur != (rlim_t)RLIM_INFINITY)
{
uiProcMemLimit = (FLMUINT)rlim.rlim_cur;
}