From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkYOA-000578-4a for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkYO9-0006aT-9d for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42290) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkYO9-0006a0-35 for qemu-devel@nongnu.org; Wed, 23 Aug 2017 12:20:17 -0400 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Wed, 23 Aug 2017 18:19:38 +0200 Message-Id: <20170823162004.27337-2-marcandre.lureau@redhat.com> In-Reply-To: <20170823162004.27337-1-marcandre.lureau@redhat.com> References: <20170823162004.27337-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 01/27] glib-compat: move G_SOURCE_CONTINUE/REMOVE there List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: changpeng.liu@intel.com, felipe@nutanix.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Signed-off-by: Marc-Andr=C3=A9 Lureau --- 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 =20 +/* 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 =20 #endif diff --git a/contrib/vhost-user-scsi/vhost-user-scsi.c b/contrib/vhost-us= er-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 @@ =20 #include =20 -/* 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 */ =20 /** Log helpers **/ --=20 2.14.1.146.gd35faa819