On 08/23/2017 01:19 PM, Marc-André Lureau wrote:
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Acked-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> include/glib-compat.h | 7 +++++++
> contrib/vhost-user-scsi/vhost-user-scsi.c | 8 --------
> 2 files changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/include/glib-compat.h b/include/glib-compat.h
> index fcffcd3f07..d35d641b7f 100644
> --- a/include/glib-compat.h
> +++ b/include/glib-compat.h
> @@ -354,5 +354,12 @@ g_test_add_data_func_full(const char *path,
> }
> #endif
>
> +/* Small compat shim from glib 2.32 */
> +#ifndef G_SOURCE_CONTINUE
> +#define G_SOURCE_CONTINUE TRUE
> +#endif
> +#ifndef G_SOURCE_REMOVE
> +#define G_SOURCE_REMOVE FALSE
> +#endif
>
> #endif
> diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-user-scsi/vhost-user-scsi.c
> index b5ae02c96f..78bcc65f5a 100644
> --- a/contrib/vhost-user-scsi/vhost-user-scsi.c
> +++ b/contrib/vhost-user-scsi/vhost-user-scsi.c
> @@ -17,14 +17,6 @@
>
> #include <glib.h>
>
> -/* Small compat shim from glib 2.32 */
> -#ifndef G_SOURCE_CONTINUE
> -#define G_SOURCE_CONTINUE TRUE
> -#endif
> -#ifndef G_SOURCE_REMOVE
> -#define G_SOURCE_REMOVE FALSE
> -#endif
> -
> /* #define VUS_DEBUG 1 */
>
> /** Log helpers **/
>