oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

event/MultiSocketMonitor: use uint64_t instead of gint64

Browse Source 
Unsigned and portable.
This commit is contained in:
Max Kellermann 2013-08-10 11:29:05 +02:00
parent 84ac79bb08
commit f3f4b332ae
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/event/MultiSocketMonitor.cxx
View File

@ -43,7 +43,7 @@ MultiSocketMonitor::MultiSocketMonitor(EventLoop &_loop)
:loop(_loop),
source((Source *)g_source_new(&multi_socket_monitor_source_funcs,
sizeof(*source))),
absolute_timeout_us(G_MAXINT64) {
absolute_timeout_us(-1) {
source->monitor = this;
g_source_attach(&source->base, loop.GetContext());
@ -61,8 +61,8 @@ MultiSocketMonitor::Prepare(gint *timeout_r)
{
int timeout_ms = *timeout_r = PrepareSockets();
absolute_timeout_us = timeout_ms < 0
? G_MAXINT64
: GetTime() + gint64(timeout_ms) * 1000;
? uint64_t(-1)
: GetTime() + uint64_t(timeout_ms) * 1000;
return false;
}

5
src/event/MultiSocketMonitor.hxx
View File

@ -29,6 +29,7 @@
#include <forward_list>
#include <assert.h>
#include <stdint.h>
#ifdef WIN32
/* ERRORis a WIN32 macro that poisons our namespace; this is a
@ -52,7 +53,7 @@ class MultiSocketMonitor {
EventLoop &loop;
Source *source;
gint64 absolute_timeout_us;
uint64_t absolute_timeout_us;
std::forward_list<GPollFD> fds;
public:
@ -69,7 +70,7 @@ public:
}
gcc_pure
gint64 GetTime() const {
uint64_t GetTime() const {
return g_source_get_time(&source->base);
}