mirror of
https://gitlab.uni-freiburg.de/opensourcevdi/virt-viewer
synced 2026-01-04 18:23:26 +00:00
Drop old compatibility code
With glib requirements now being 2.38, these functions do not make sense anymore. Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
This commit is contained in:
Eduardo Lima (Etrunko)
Fabiano Fidêncio
parent
3270ce61af
commit
76d2e483d5
@ -40,8 +40,6 @@ $(BUILT_SOURCES): %: %.etemplate $(ENUMS_FILES)
|
||||
|
||||
libvirt_viewer_la_SOURCES = \
|
||||
$(BUILT_SOURCES) \
|
||||
virt-glib-compat.h \
|
||||
virt-glib-compat.c \
|
||||
virt-viewer-util.h \
|
||||
virt-viewer-util.c \
|
||||
virt-viewer-auth.h \
|
||||
|
||||
@ -28,7 +28,6 @@
|
||||
#include <string.h>
|
||||
|
||||
#include "ovirt-foreign-menu.h"
|
||||
#include "virt-glib-compat.h"
|
||||
#include "virt-viewer-util.h"
|
||||
|
||||
typedef enum {
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */
|
||||
/*
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
#include <config.h>
|
||||
|
||||
#include "virt-glib-compat.h"
|
||||
|
||||
#if !GLIB_CHECK_VERSION(2,32,0)
|
||||
GByteArray *g_byte_array_new_take (guint8 *data, gsize len)
|
||||
{
|
||||
GByteArray *array;
|
||||
|
||||
array = g_byte_array_new ();
|
||||
g_assert (array->data == NULL);
|
||||
g_assert (array->len == 0);
|
||||
|
||||
array->data = data;
|
||||
array->len = len;
|
||||
|
||||
return array;
|
||||
}
|
||||
#endif
|
||||
@ -1,83 +0,0 @@
|
||||
/*
|
||||
* 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
|
||||
|
||||
#if !GLIB_CHECK_VERSION(2,28,0)
|
||||
#define g_clear_object(object_ptr) \
|
||||
G_STMT_START { \
|
||||
/* Only one access, please */ \
|
||||
gpointer *_p = (gpointer) (object_ptr); \
|
||||
gpointer _o; \
|
||||
\
|
||||
do \
|
||||
_o = g_atomic_pointer_get (_p); \
|
||||
while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_p, _o, NULL));\
|
||||
\
|
||||
if (_o) \
|
||||
g_object_unref (_o); \
|
||||
} G_STMT_END
|
||||
#endif
|
||||
|
||||
#if !GLIB_CHECK_VERSION(2,32,0)
|
||||
GByteArray *g_byte_array_new_take (guint8 *data, gsize len);
|
||||
|
||||
#define G_SOURCE_CONTINUE TRUE
|
||||
#define G_SOURCE_REMOVE FALSE
|
||||
#endif
|
||||
|
||||
#if GLIB_CHECK_VERSION(2,31,0)
|
||||
#define g_mutex_new() g_new0(GMutex, 1)
|
||||
#endif
|
||||
|
||||
G_END_DECLS
|
||||
|
||||
#endif // _VIRT_GLIB_COMPAT_H
|
||||
@ -33,7 +33,6 @@
|
||||
#include <libvirt/libvirt.h>
|
||||
|
||||
#include "virt-viewer-events.h"
|
||||
#include "virt-glib-compat.h"
|
||||
|
||||
static GMutex *eventlock = NULL;
|
||||
|
||||
|
||||
@ -21,7 +21,6 @@
|
||||
#ifndef __VIRT_VIEWER_FILE_H__
|
||||
#define __VIRT_VIEWER_FILE_H__
|
||||
|
||||
#include "virt-glib-compat.h"
|
||||
#include "virt-viewer-app.h"
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
@ -37,7 +37,6 @@
|
||||
#include "virt-viewer-session-spice.h"
|
||||
#include "virt-viewer-display-spice.h"
|
||||
#include "virt-viewer-auth.h"
|
||||
#include "virt-glib-compat.h"
|
||||
|
||||
#if !GLIB_CHECK_VERSION(2, 26, 0)
|
||||
#include "gbinding.h"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user