summaryrefslogtreecommitdiff
path: root/metadata
diff options
context:
space:
mode:
authorChristian Kellner <gicmo@gnome.org>2010-02-14 18:53:25 +0100
committerChristian Kellner <gicmo@gnome.org>2010-02-14 18:53:25 +0100
commit52ab4355f74a0862815ce2d29a6388830c2cb244 (patch)
tree4e590b0cb21921beb3b9f19284fffaec9500238a /metadata
parent3618893e907ebf3d89237cd70460da81b9429f11 (diff)
downloadgvfs-52ab4355f74a0862815ce2d29a6388830c2cb244.tar.gz
Use g_poll instead of poll in metatree.c
Patch by "paul <ephraim_owns@hotmail.com>" Fixes bug #60468.
Diffstat (limited to 'metadata')
-rw-r--r--metadata/metatree.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/metadata/metatree.c b/metadata/metatree.c
index 2820fb5d..3a1c12b1 100644
--- a/metadata/metatree.c
+++ b/metadata/metatree.c
@@ -51,7 +51,6 @@
#include <glib.h>
#include <glib/gstdio.h>
#include <errno.h>
-#include <poll.h>
#include "crc32.h"
#ifdef HAVE_LIBUDEV
@@ -2989,7 +2988,7 @@ update_mountinfo (void)
char *contents;
int res;
gboolean first;
- struct pollfd pfd;
+ GPollFD pfd;
first = FALSE;
if (!mountinfo_initialized)
@@ -3005,9 +3004,9 @@ update_mountinfo (void)
if (!first)
{
pfd.fd = mountinfo_fd;
- pfd.events = POLLIN | POLLOUT | POLLPRI;
+ pfd.events = G_IO_IN | G_IO_OUT | G_IO_PRI;
pfd.revents = 0;
- res = poll (&pfd, 1, 0);
+ res = g_poll (&pfd, 1, 0);
if (res == 0)
return;
}