diff options
| author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-07-17 20:44:37 +0200 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2012-07-23 16:27:33 +0200 |
| commit | c8d20b35bd8cba06cfea394d21fdd913ede06069 (patch) | |
| tree | 680f7991afbd11d1b948d1bfb65ed0a8a667438b /src | |
| parent | db7c5b20b09dc42eee9d6fd46cad63976663cf17 (diff) | |
| download | virt-viewer-c8d20b35bd8cba06cfea394d21fdd913ede06069.tar.gz virt-viewer-c8d20b35bd8cba06cfea394d21fdd913ede06069.tar.xz virt-viewer-c8d20b35bd8cba06cfea394d21fdd913ede06069.zip | |
Bump glib > 2.22, add compat file
We use API from 2.22, and some from further version. Add
virt-glib-compat.h fallback file for those.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/virt-glib-compat.h | 56 |
2 files changed, 57 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5daa98a..8f9339c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -32,6 +32,7 @@ $(BUILT_SOURCES): %: %.etemplate $(ENUMS_FILES) COMMON_SOURCES = \ $(BUILT_SOURCES) \ + virt-glib-compat.h \ virt-gtk-compat.h \ virt-viewer-util.h virt-viewer-util.c \ virt-viewer-auth.h virt-viewer-auth.c \ diff --git a/src/virt-glib-compat.h b/src/virt-glib-compat.h new file mode 100644 index 0000000..23345a0 --- /dev/null +++ b/src/virt-glib-compat.h @@ -0,0 +1,56 @@ +/* + * Virt Viewer: A virtual machine console viewer + * + * Copyright (C) 2007-2009 Red Hat, Inc. + * Copyright (C) 2009-2012 Daniel P. Berrange + * Copyright (C) 2010 Marc-André Lureau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Author: Daniel P. Berrange <berrange@redhat.com> + */ + +#include <config.h> + +#ifndef _VIRT_GLIB_COMPAT_H +# define _VIRT_GLIB_COMPAT_H 1 + +#include <glib-object.h> + +G_BEGIN_DECLS + +#ifndef g_clear_pointer +#define g_clear_pointer(pp, destroy) \ + G_STMT_START { \ + G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \ + /* Only one access, please */ \ + gpointer *_pp = (gpointer *) (pp); \ + gpointer _p; \ + /* This assignment is needed to avoid a gcc warning */ \ + GDestroyNotify _destroy = (GDestroyNotify) (destroy); \ + \ + (void) (0 ? (gpointer) *(pp) : 0); \ + do \ + _p = g_atomic_pointer_get (_pp); \ + while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_pp, _p, NULL)); \ + \ + if (_p) \ + _destroy (_p); \ + } G_STMT_END +#endif + +G_END_DECLS + +#endif // _VIRT_GLIB_COMPAT_H |