> > My preference would be to squash with the first patch > Not hard to merge patches, just need to find a sensible commit message. What about:
"Use a compatibility header to support GLib 2.28" Frediano > On Mon, 2016-10-17 at 14:26 +0100, Frediano Ziglio wrote: > > Signed-off-by: Frediano Ziglio <fzig...@redhat.com> > Acked-by: Pavel Grunt <pgr...@redhat.com> > > --- > > server/char-device.c | 1 + > > server/red-channel-client.c | 1 + > > 2 files changed, 2 insertions(+) > > > > diff --git a/server/char-device.c b/server/char-device.c > > index 4f01d3c..7775c07 100644 > > --- a/server/char-device.c > > +++ b/server/char-device.c > > @@ -25,6 +25,7 @@ > > #include "char-device.h" > > #include "red-channel.h" > > #include "reds.h" > > +#include "glib-compat.h" > > > > #define CHAR_DEVICE_WRITE_TO_TIMEOUT 100 > > #define RED_CHAR_DEVICE_WAIT_TOKENS_TIMEOUT 30000 > > diff --git a/server/red-channel-client.c b/server/red-channel- > > client.c > > index 36d9c33..9426b13 100644 > > --- a/server/red-channel-client.c > > +++ b/server/red-channel-client.c > > @@ -36,6 +36,7 @@ > > #include "red-channel-client.h" > > #include "red-channel-client-private.h" > > #include "red-channel.h" > > +#include "glib-compat.h" > > > > static const SpiceDataHeaderOpaque full_header_wrapper; > > static const SpiceDataHeaderOpaque mini_header_wrapper; > _______________________________________________ Spice-devel mailing list Spice-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/spice-devel
