barrier.h is no longer used anywhere --- spice/Makefile.am | 1 - spice/barrier.h | 55 ------------------------------------------------------- spice/qxl_dev.h | 1 - 3 files changed, 57 deletions(-) delete mode 100644 spice/barrier.h diff --git a/spice/Makefile.am b/spice/Makefile.am index a54ae89..21e6e79 100644 --- a/spice/Makefile.am +++ b/spice/Makefile.am @@ -3,7 +3,6 @@ NULL = spice_protocol_includedir = $(includedir)/spice-1/spice spice_protocol_include_HEADERS = \ - barrier.h \ controller_prot.h \ end-packed.h \ enums.h \ diff --git a/spice/barrier.h b/spice/barrier.h deleted file mode 100644 index 710da09..0000000 --- a/spice/barrier.h +++ /dev/null @@ -1,55 +0,0 @@ -/* -*- Mode: C; tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- */ -/* - Copyright (C) 2009 Red Hat, Inc. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS - IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ - -#ifndef _H_SPICE_BARRIER -#define _H_SPICE_BARRIER - -#ifdef __GNUC__ - -#ifdef __i386__ -#define spice_mb() __asm__ __volatile__ ("lock; addl $0,0(%%esp)": : :"memory") -#else -//mfence -#define spice_mb() __asm__ __volatile__ ("lock; addl $0,0(%%rsp)": : :"memory") -#endif - -#else - -#ifdef _WIN64 -//__asm not supported on _WIN64, so use macro instead. -#define spice_mb MemoryBarrier -#else -#define spice_mb() __asm {lock add [esp], 0} -#endif - -#endif - -#endif /* _H_SPICE_BARRIER */ diff --git a/spice/qxl_dev.h b/spice/qxl_dev.h index a3e91a5..dd3de4e 100644 --- a/spice/qxl_dev.h +++ b/spice/qxl_dev.h @@ -33,7 +33,6 @@ #define _H_QXL_DEV #include <spice/types.h> -#include <spice/barrier.h> #include <spice/ipc_ring.h> #include <spice/enums.h> -- 1.8.1.4 _______________________________________________ Spice-devel mailing list Spice-devel@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/spice-devel