From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48460) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yvt6v-0005H2-VD for qemu-devel@nongnu.org; Fri, 22 May 2015 16:00:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yvt6t-0004fy-Vx for qemu-devel@nongnu.org; Fri, 22 May 2015 16:00:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:55166) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yvt6t-0004e4-Nz for qemu-devel@nongnu.org; Fri, 22 May 2015 15:59:59 -0400 From: John Snow Date: Fri, 22 May 2015 15:59:35 -0400 Message-Id: <1432324792-9373-3-git-send-email-jsnow@redhat.com> In-Reply-To: <1432324792-9373-1-git-send-email-jsnow@redhat.com> References: <1432324792-9373-1-git-send-email-jsnow@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 02/19] glib: remove stale compat functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, jsnow@redhat.com Since we're bumping the version to 2.22+, remove the now-stale compat functions. Signed-off-by: John Snow Reviewed-by: Markus Armbruster Reviewed-by: Alex Benn=C3=A9e Message-id: 1431469140-22208-2-git-send-email-jsnow@redhat.com --- include/glib-compat.h | 35 ----------------------------------- 1 file changed, 35 deletions(-) diff --git a/include/glib-compat.h b/include/glib-compat.h index 28d9f15..318e000 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -23,14 +23,6 @@ #define G_TIME_SPAN_SECOND (G_GINT64_CONSTANT(1000000)) #endif =20 -#if !GLIB_CHECK_VERSION(2, 14, 0) -static inline guint g_timeout_add_seconds(guint interval, GSourceFunc fu= nction, - gpointer data) -{ - return g_timeout_add(interval * 1000, function, data); -} -#endif - #if !GLIB_CHECK_VERSION(2, 28, 0) static inline gint64 qemu_g_get_monotonic_time(void) { @@ -47,23 +39,6 @@ static inline gint64 qemu_g_get_monotonic_time(void) #define g_get_monotonic_time() qemu_g_get_monotonic_time() #endif =20 -#if !GLIB_CHECK_VERSION(2, 16, 0) -static inline int g_strcmp0(const char *str1, const char *str2) -{ - int result; - - if (!str1) { - result =3D -(str1 !=3D str2); - } else if (!str2) { - result =3D (str1 !=3D str2); - } else { - result =3D strcmp(str1, str2); - } - - return result; -} -#endif - #ifdef _WIN32 /* * g_poll has a problem on Windows when using @@ -71,16 +46,6 @@ static inline int g_strcmp0(const char *str1, const ch= ar *str2) */ #define g_poll(fds, nfds, timeout) g_poll_fixed(fds, nfds, timeout) gint g_poll_fixed(GPollFD *fds, guint nfds, gint timeout); -#elif !GLIB_CHECK_VERSION(2, 20, 0) -/* - * Glib before 2.20.0 doesn't implement g_poll, so wrap it to compile pr= operly - * on older systems. - */ -static inline gint g_poll(GPollFD *fds, guint nfds, gint timeout) -{ - GMainContext *ctx =3D g_main_context_default(); - return g_main_context_get_poll_func(ctx)(fds, nfds, timeout); -} #endif =20 #if !GLIB_CHECK_VERSION(2, 31, 0) --=20 2.1.0