diff --git a/builds/msvc/vs2010/libzmq/libzmq.vcxproj b/builds/msvc/vs2010/libzmq/libzmq.vcxproj index c7d08f6d..f406a30d 100644 --- a/builds/msvc/vs2010/libzmq/libzmq.vcxproj +++ b/builds/msvc/vs2010/libzmq/libzmq.vcxproj @@ -151,11 +151,11 @@ + + - - @@ -241,12 +241,12 @@ + + - - diff --git a/builds/msvc/vs2012/libzmq/libzmq.vcxproj b/builds/msvc/vs2012/libzmq/libzmq.vcxproj index d8d08797..16030d04 100644 --- a/builds/msvc/vs2012/libzmq/libzmq.vcxproj +++ b/builds/msvc/vs2012/libzmq/libzmq.vcxproj @@ -151,11 +151,11 @@ + + - - @@ -241,12 +241,12 @@ + + - - diff --git a/builds/msvc/vs2013/libzmq/libzmq.vcxproj b/builds/msvc/vs2013/libzmq/libzmq.vcxproj index a5889721..f04f7cc8 100644 --- a/builds/msvc/vs2013/libzmq/libzmq.vcxproj +++ b/builds/msvc/vs2013/libzmq/libzmq.vcxproj @@ -151,11 +151,11 @@ + + - - @@ -241,12 +241,12 @@ + + - - diff --git a/builds/msvc/vs2015/libzmq/libzmq.vcxproj b/builds/msvc/vs2015/libzmq/libzmq.vcxproj index 4999d942..55494300 100644 --- a/builds/msvc/vs2015/libzmq/libzmq.vcxproj +++ b/builds/msvc/vs2015/libzmq/libzmq.vcxproj @@ -159,11 +159,11 @@ + + - - @@ -255,8 +255,6 @@ - - diff --git a/src/timers.cpp b/src/timers.cpp index cb22dceb..dffc2502 100644 --- a/src/timers.cpp +++ b/src/timers.cpp @@ -117,9 +117,9 @@ long zmq::timers_t::timeout () // Live timer, lets return the timeout if (cancelled_it == cancelled_timers.end ()) { if (it->first > now) - return it->first - now; + return (long) (it->first - now); else - return 0; + return 0; } // Let's remove it from the begining of the list