| Message ID | 1364225098-13712-1-git-send-email-aliguori@us.ibm.com |
|---|---|
| State | New |
| Headers | show |
On 25 March 2013 15:24, Anthony Liguori <aliguori@us.ibm.com> wrote: > Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> > +#if !GLIB_CHECK_VERSION(2, 14, 0) > +static inline guint g_timeout_add_seconds(guint interval, GSourceFunc function, > + gpointer data) > +{ > + return g_timeout_add(interval * 1000, function, data); > +} > +#endif Wow, the function names for these are horrible. I would never have guessed that g_timeout_add_seconds() had different semantics from g_timeout_add() except that I just double checked the documentation because the usage in qemu-char.c looked so totally weird. -- PMM
Applied. Thanks. Regards, Anthony Liguori
On Mon, Mar 25, 2013 at 08:21:13PM -0000, Anthony Liguori wrote:
> Applied. Thanks.
Thanks for applying. RHEL5 and other old buildslaves should turn green
again now :).
Stefan
diff --git a/include/glib-compat.h b/include/glib-compat.h new file mode 100644 index 0000000..8aa77af --- /dev/null +++ b/include/glib-compat.h @@ -0,0 +1,27 @@ +/* + * GLIB Compatibility Functions + * + * Copyright IBM, Corp. 2013 + * + * Authors: + * Anthony Liguori <aliguori@us.ibm.com> + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + * + */ + +#ifndef QEMU_GLIB_COMPAT_H +#define QEMU_GLIB_COMPAT_H + +#include <glib.h> + +#if !GLIB_CHECK_VERSION(2, 14, 0) +static inline guint g_timeout_add_seconds(guint interval, GSourceFunc function, + gpointer data) +{ + return g_timeout_add(interval * 1000, function, data); +} +#endif + +#endif diff --git a/include/qemu-common.h b/include/qemu-common.h index 7754ee2..2371132 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -40,7 +40,7 @@ #include <sys/time.h> #include <assert.h> #include <signal.h> -#include <glib.h> +#include "glib-compat.h" #ifdef _WIN32 #include "sysemu/os-win32.h"
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> --- include/glib-compat.h | 27 +++++++++++++++++++++++++++ include/qemu-common.h | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 include/glib-compat.h