diff --git a/ftk/Makefile b/ftk/Makefile index 7d10a02..84d3dd8 100644 --- a/ftk/Makefile +++ b/ftk/Makefile @@ -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 = diff --git a/ftk/src/ftkmem.cpp b/ftk/src/ftkmem.cpp index 555bfe8..39bb0bf 100644 --- a/ftk/src/ftkmem.cpp +++ b/ftk/src/ftkmem.cpp @@ -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; }