diff --git a/README.md b/README.md index 4c1173f4b..bb575a3bc 100755 --- a/README.md +++ b/README.md @@ -208,6 +208,7 @@ Supported operating systems and hardware: * 2013-10-17, Created.
## History +* v1.0, 2014-08-28, fix [#167](https://github.com/winlinvip/simple-rtmp-server/issues/167), add openssl includes to utest. 0.9.209. * v1.0, 2014-08-27, max connections is 32756, for st use mmap default. 0.9.209 * v1.0, 2014-08-24, fix [#150](https://github.com/winlinvip/simple-rtmp-server/issues/150), forward should forward the sequence header when retry. 0.9.208. * v1.0, 2014-08-22, for [#165](https://github.com/winlinvip/simple-rtmp-server/issues/165), refine dh wrapper, ensure public key is 128bytes. 0.9.206. diff --git a/trunk/configure b/trunk/configure index 088972241..7e7a5d42d 100755 --- a/trunk/configure +++ b/trunk/configure @@ -491,7 +491,7 @@ fi MODULE_FILES=("srs_utest" "srs_utest_amf0" "srs_utest_protocol" "srs_utest_kernel" "srs_utest_core" "srs_utest_config" "srs_utest_reload") -ModuleLibIncs=(${SRS_OBJS} ${LibSTRoot}) +ModuleLibIncs=(${SRS_OBJS} ${LibSTRoot} ${LibSSLRoot}) ModuleLibFiles=(${LibSTfile} ${LibHttpParserfile} ${LibSSLfile}) MODULE_DEPENDS=("CORE" "KERNEL" "RTMP" "APP") MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${RTMP_OBJS[@]} ${APP_OBJS[@]}" diff --git a/trunk/src/app/srs_app_utility.hpp b/trunk/src/app/srs_app_utility.hpp index 891f54d55..d718b0ec5 100644 --- a/trunk/src/app/srs_app_utility.hpp +++ b/trunk/src/app/srs_app_utility.hpp @@ -446,21 +446,21 @@ public: // data of /proc/meminfo public: // MemActive = MemTotal - MemFree - int64_t MemActive; + u_int64_t MemActive; // RealInUse = MemActive - Buffers - Cached - int64_t RealInUse; + u_int64_t RealInUse; // NotInUse = MemTotal - RealInUse // = MemTotal - MemActive + Buffers + Cached // = MemTotal - MemTotal + MemFree + Buffers + Cached // = MemFree + Buffers + Cached - int64_t NotInUse; + u_int64_t NotInUse; - int64_t MemTotal; - int64_t MemFree; - int64_t Buffers; - int64_t Cached; - int64_t SwapTotal; - int64_t SwapFree; + u_int64_t MemTotal; + u_int64_t MemFree; + u_int64_t Buffers; + u_int64_t Cached; + u_int64_t SwapTotal; + u_int64_t SwapFree; public: SrsMemInfo();