Commit 31e76f65 authored by Alexander Graf's avatar Alexander Graf Committed by Anthony Liguori
Browse files

glib: Add compat wrapper for g_poll on old glib 



Older glib doesn't implement g_poll(). Most notably the glib version in use
on SLE11 is on 2.18 which is hit by this.

We do want to use g_poll() in the source however. So on older systems, just
wrap it with functions that do exist on older versions.

Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Message-id: 1361835970-2889-1-git-send-email-agraf@suse.de
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 989b697d

include/qemu-common.h

+12 −0
Original line number Diff line number Diff line
@@ -142,6 +142,18 @@ int qemu_main(int argc, char **argv, char **envp); 
void qemu_get_timedate(struct tm *tm, int offset);

int qemu_timedate_diff(struct tm *tm);



#if !GLIB_CHECK_VERSION(2, 20, 0)

/*

 * Glib before 2.20.0 doesn't implement g_poll, so wrap it to compile properly

 * on older systems.

 */

static inline gint g_poll(GPollFD *fds, guint nfds, gint timeout)

{

    GMainContext *ctx = g_main_context_default();

    return g_main_context_get_poll_func(ctx)(fds, nfds, timeout);

}

#endif



/**

 * is_help_option:

 * @s: string to test