Re: [Spice-devel] [PATCH spice-server 01/10] Define a compatibility include for GLib

[Frediano Ziglio]

> 
> On Tue, 2016-10-18 at 10:38 +0200, Francois Gouget wrote:
> > On Tue, 18 Oct 2016, Pavel Grunt wrote:
> > [...]
> > > > +#if !GLIB_CHECK_VERSION(2,30,0)
> > > > +static inline gboolean
> > > > +g_queue_remove_boolean(GQueue *queue, gconstpointer data)
> > > > +{
> > > > +   GList *link = g_queue_find(queue, data);
> > > > +   if (!link) {
> > > > +   return FALSE;
> > > > +   }
> > > > +   g_queue_unlink(queue, link);
> > > > +   return TRUE;
> > > > +}
> > > > +#define g_queue_remove g_queue_remove_boolean
> > > 
> > > glib changed the function ?
> > 
> > g_queue_remove() used to return void, thus causing a compilation
> > error
> > where we assigned / returned its value.
> > 
> I see, I don't like these api changes.. Even worse without updating
> the documentation for the function.
> 
> Ack for the patch
> 
> (I don't have a el6 machine where i could test these stuff)
> 
> Pavel
> 

https://github.com/GNOME/glib/commit/f065d7d60e2b6110705b1b32f050ccad0bcde62f

Frediano
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-server 01/10] Define a compatibility include for GLib

[Pavel Grunt]

On Tue, 2016-10-18 at 10:38 +0200, Francois Gouget wrote:
> On Tue, 18 Oct 2016, Pavel Grunt wrote:
> [...]
> > > +#if !GLIB_CHECK_VERSION(2,30,0)
> > > +static inline gboolean
> > > +g_queue_remove_boolean(GQueue *queue, gconstpointer data)
> > > +{
> > > + GList *link = g_queue_find(queue, data);
> > > + if (!link) {
> > > + return FALSE;
> > > + }
> > > + g_queue_unlink(queue, link);
> > > + return TRUE;
> > > +}
> > > +#define g_queue_remove g_queue_remove_boolean
> > 
> > glib changed the function ?
> 
> g_queue_remove() used to return void, thus causing a compilation
> error 
> where we assigned / returned its value.
> 
I see, I don't like these api changes.. Even worse without updating
the documentation for the function.

Ack for the patch

(I don't have a el6 machine where i could test these stuff)

Pavel
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-server 01/10] Define a compatibility include for GLib

[Francois Gouget]

On Tue, 18 Oct 2016, Pavel Grunt wrote:
[...]
> > +#if !GLIB_CHECK_VERSION(2,30,0)
> > +static inline gboolean
> > +g_queue_remove_boolean(GQueue *queue, gconstpointer data)
> > +{
> > +   GList *link = g_queue_find(queue, data);
> > +   if (!link) {
> > +   return FALSE;
> > +   }
> > +   g_queue_unlink(queue, link);
> > +   return TRUE;
> > +}
> > +#define g_queue_remove g_queue_remove_boolean
> 
> glib changed the function ?

g_queue_remove() used to return void, thus causing a compilation error 
where we assigned / returned its value.


-- 
Francois Gouget 
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

Re: [Spice-devel] [PATCH spice-server 01/10] Define a compatibility include for GLib

[Pavel Grunt]

Hi,

On Mon, 2016-10-17 at 14:26 +0100, Frediano Ziglio wrote:
> Signed-off-by: Frediano Ziglio 
> ---
>  server/Makefile.am   |  1 +
>  server/glib-compat.h | 47
> +++
>  2 files changed, 48 insertions(+)
>  create mode 100644 server/glib-compat.h
> 
> diff --git a/server/Makefile.am b/server/Makefile.am
> index 036abcd..dff1ad2 100644
> --- a/server/Makefile.am
> +++ b/server/Makefile.am
> @@ -162,6 +162,7 @@ libserver_la_SOURCES =
> \
>   dcc-private.h   \
>   image-encoders.c\
>   image-encoders.h\
> + glib-compat.h   \
>   $(spice_built_sources)  \
>   $(NULL)
>  
> diff --git a/server/glib-compat.h b/server/glib-compat.h
> new file mode 100644
> index 000..a20a434
> --- /dev/null
> +++ b/server/glib-compat.h
> @@ -0,0 +1,47 @@
> +/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */
> +/*
> +   Copyright (C) 2016 Red Hat, Inc.
> +
> +   This library is free software; you can redistribute it and/or
> +   modify it under the terms of the GNU Lesser General Public
> +   License as published by the Free Software Foundation; either
> +   version 2.1 of the License, or (at your option) any later
> version.
> +
> +   This library is distributed in the hope that it will be useful,
> +   but WITHOUT ANY WARRANTY; without even the implied warranty of
> +   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> GNU
> +   Lesser General Public License for more details.
> +
> +   You should have received a copy of the GNU Lesser General Public
> +   License along with this library; if not, see  /licenses/>.
> +*/
> +#ifndef GLIB_COMPAT_H_
> +#define GLIB_COMPAT_H_
> +
> +#include 
> +
> +#if !GLIB_CHECK_VERSION(2,32,0)
> +static inline void
> +g_queue_free_full(GQueue *queue, GDestroyNotify free_func)
> +{
> + /* quite hack cast but work with standard C call convention
> */
> + g_queue_foreach(queue, (GFunc) free_func, NULL);
> + g_queue_clear(queue);
> +}
> +#endif
> +
> +#if !GLIB_CHECK_VERSION(2,30,0)
> +static inline gboolean
> +g_queue_remove_boolean(GQueue *queue, gconstpointer data)
> +{
> + GList *link = g_queue_find(queue, data);
> + if (!link) {
> + return FALSE;
> + }
> + g_queue_unlink(queue, link);
> + return TRUE;
> +}
> +#define g_queue_remove g_queue_remove_boolean

glib changed the function ?

> +#endif
> +
> +#endif /* GLIB_COMPAT_H_ */
___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel

[Spice-devel] [PATCH spice-server 01/10] Define a compatibility include for GLib

[Frediano Ziglio]

Signed-off-by: Frediano Ziglio 
---
 server/Makefile.am   |  1 +
 server/glib-compat.h | 47 +++
 2 files changed, 48 insertions(+)
 create mode 100644 server/glib-compat.h

diff --git a/server/Makefile.am b/server/Makefile.am
index 036abcd..dff1ad2 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -162,6 +162,7 @@ libserver_la_SOURCES =  \
dcc-private.h   \
image-encoders.c\
image-encoders.h\
+   glib-compat.h   \
$(spice_built_sources)  \
$(NULL)
 
diff --git a/server/glib-compat.h b/server/glib-compat.h
new file mode 100644
index 000..a20a434
--- /dev/null
+++ b/server/glib-compat.h
@@ -0,0 +1,47 @@
+/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/*
+   Copyright (C) 2016 Red Hat, Inc.
+
+   This library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
+
+   This library is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this library; if not, see .
+*/
+#ifndef GLIB_COMPAT_H_
+#define GLIB_COMPAT_H_
+
+#include 
+
+#if !GLIB_CHECK_VERSION(2,32,0)
+static inline void
+g_queue_free_full(GQueue *queue, GDestroyNotify free_func)
+{
+   /* quite hack cast but work with standard C call convention */
+   g_queue_foreach(queue, (GFunc) free_func, NULL);
+   g_queue_clear(queue);
+}
+#endif
+
+#if !GLIB_CHECK_VERSION(2,30,0)
+static inline gboolean
+g_queue_remove_boolean(GQueue *queue, gconstpointer data)
+{
+   GList *link = g_queue_find(queue, data);
+   if (!link) {
+   return FALSE;
+   }
+   g_queue_unlink(queue, link);
+   return TRUE;
+}
+#define g_queue_remove g_queue_remove_boolean
+#endif
+
+#endif /* GLIB_COMPAT_H_ */
-- 
2.7.4

___
Spice-devel mailing list
Spice-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/spice-devel