[Spice-devel] [spice-common] Remove unused header file

[Christophe Fergeau]

On Thu, Dec 04, 2014 at 02:36:29PM +0100, Fabiano Fidêncio wrote:
> On Thu, 2014-12-04 at 14:15 +0100, Christophe Fergeau wrote:
> > Nothing uses the definition it contains (I've tested spice-gtk and
> > spice)
> > ---
> >  common/canvas_base.c |  1 -
> >  common/mutex.h       | 42 ------------------------------------------
> >  2 files changed, 43 deletions(-)
> >  delete mode 100644 common/mutex.h
> > 
> > diff --git a/common/canvas_base.c b/common/canvas_base.c
> > index a1bfc27..ddcbe32 100644
> > --- a/common/canvas_base.c
> > +++ b/common/canvas_base.c
> > @@ -42,7 +42,6 @@
> >  #include "rop3.h"
> >  #include "mem.h"
> >  #include "macros.h"
> > -#include "mutex.h"
> >  
> >  #define ROUND(_x) ((int)floor((_x) + 0.5))
> >  
> > diff --git a/common/mutex.h b/common/mutex.h
> > deleted file mode 100644
> > index 3e2e0de..0000000
> > --- a/common/mutex.h
> > +++ /dev/null
> > @@ -1,42 +0,0 @@
> > -/* -*- Mode: C; c-basic-offset: 4; indent-tabs-mode: nil -*- */
> > -/*
> > -   Copyright (C) 2009 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 <http://www.gnu.org/licenses/>.
> > -*/
> > -
> > -#ifndef _H_MUTEX
> > -#define _H_MUTEX
> > -
> > -#include <spice/macros.h>
> > -
> > -SPICE_BEGIN_DECLS
> > -
> > -#ifdef _WIN32
> > -#include <windows.h>
> > -typedef CRITICAL_SECTION mutex_t;
> > -#define MUTEX_INIT(mutex) InitializeCriticalSection(&mutex)
> > -#define MUTEX_LOCK(mutex) EnterCriticalSection(&mutex)
> > -#define MUTEX_UNLOCK(mutex) LeaveCriticalSection(&mutex)
> > -#else
> > -#include <pthread.h>
> > -typedef pthread_mutex_t mutex_t;
> > -#define MUTEX_INIT(mutex) pthread_mutex_init(&mutex, NULL);
> > -#define MUTEX_LOCK(mutex) pthread_mutex_lock(&mutex)
> > -#define MUTEX_UNLOCK(mutex) pthread_mutex_unlock(&mutex)
> > -#endif
> > -
> > -SPICE_END_DECLS
> > -
> > -#endif // _H_MUTEX
> 
> Have you tested using MinGW as well?
> If yes, ACK

I hadn't yet, but a bit of grepping made me notice that I need to squash in this:

diff --git a/common/Makefile.am b/common/Makefile.am
index 7b3aae9..19335ce 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -40,7 +40,6 @@ libspice_common_la_SOURCES =          \
        mem.c                           \
        mem.h                           \
        messages.h                      \
-       mutex.h                         \
        pixman_utils.c                  \
        pixman_utils.h                  \
        quic.c                          \

mingw compilation is working as well (only tested mingw64)

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20141204/1a809355/attachment.sig>