diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-01-10 17:51:06 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-01-10 17:51:06 +0000 |
| commit | f7a99e90470526bb28cc0c225f96490110094aed (patch) | |
| tree | cbcc4f2df6d66e180fd65ee50488545786d094f1 /polyp/glib12-mainloop.c | |
| parent | 80ae72ce45dbc23ddc360749924110dcc752491e (diff) | |
Merge Pierre's changes
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@445 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'polyp/glib12-mainloop.c')
| -rw-r--r-- | polyp/glib12-mainloop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/polyp/glib12-mainloop.c b/polyp/glib12-mainloop.c index 5f037347..c328471c 100644 --- a/polyp/glib12-mainloop.c +++ b/polyp/glib12-mainloop.c @@ -233,7 +233,7 @@ static void glib_time_restart(struct pa_time_event*e, const struct timeval *tv) struct timeval now; assert(e && e->mainloop && !e->dead); - gettimeofday(&now, NULL); + pa_gettimeofday(&now); if (e->source != (guint) -1) g_source_remove(e->source); |