npapi-vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Fri Mar 27 19:04:28 2015 +0100| [404a82e5bce088f1ce6cd6296963a3f806afcd5a] | committer: Hugo Beauzée-Luyssen
npapi: Remove unused locking.h > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=404a82e5bce088f1ce6cd6296963a3f806afcd5a --- npapi/Makefile.am | 1 - npapi/common.h | 2 - npapi/locking.h | 105 ----------------------------------------------------- npapi/utils.hpp | 2 + 4 files changed, 2 insertions(+), 108 deletions(-) diff --git a/npapi/Makefile.am b/npapi/Makefile.am index c346e37..3119388 100644 --- a/npapi/Makefile.am +++ b/npapi/Makefile.am @@ -17,7 +17,6 @@ AM_CPPFLAGS = $(LIBVLC_CFLAGS) -Inpapi-sdk $(MOZILLA_CFLAGS) -I$(top_srcdir)/vlc libvlcplugin_la_SOURCES = \ common.h \ - locking.h \ vlcshell.h \ vlcshell.cpp \ vlcplugin.h \ diff --git a/npapi/common.h b/npapi/common.h index 270f20f..f173ced 100644 --- a/npapi/common.h +++ b/npapi/common.h @@ -77,8 +77,6 @@ typedef int32_t NPint32_t; #endif -#include "locking.h" - /* * Define PLUGIN_TRACE to have the wrapper functions print * messages to stderr whenever they are called. diff --git a/npapi/locking.h b/npapi/locking.h deleted file mode 100644 index 975c744..0000000 --- a/npapi/locking.h +++ /dev/null @@ -1,105 +0,0 @@ -/***************************************************************************** - * locking.h: a VLC plugin for Mozilla - ***************************************************************************** - * Copyright (C) 2002-2012 VideoLAN - * $Id$ - * - * Authors: Samuel Hocevar <[email protected]> - * Damien Fouilleul <[email protected]> - * Jean-Paul Saman <[email protected]> - * Sergey Radionov <[email protected]> - * Jean-Baptiste Kempf <[email protected]> - * Cheng Sun <[email protected]> - * - * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - -#ifndef __VLCPLUGIN_LOCKING_H__ -#define __VLCPLUGIN_LOCKING_H__ - -/* Lock includes */ -#ifdef XP_WIN -# include <windows.h> -#elif defined(HAVE_PTHREAD) -# include <pthread.h> -#endif -#include <assert.h> - -typedef struct { -#if defined(HAVE_PTHREAD) - pthread_mutex_t mutex; -#elif defined(XP_WIN) - CRITICAL_SECTION cs; -#else -# warning "locking not implemented in this platform" -#endif -} plugin_lock_t; - -/***************************************************************************** - * Lock utility functions - *****************************************************************************/ -static void plugin_lock_init(plugin_lock_t *lock) -{ - assert(lock); - -#if defined(HAVE_PTHREAD) - pthread_mutex_init(&lock->mutex, NULL); -#elif defined(XP_WIN) - InitializeCriticalSection(&lock->cs); -#else -#warning "locking not implemented in this platform" -#endif -} - -static void plugin_lock_destroy(plugin_lock_t *lock) -{ - assert(lock); - -#if defined(HAVE_PTHREAD) - pthread_mutex_destroy(&lock->mutex); -#elif defined(XP_WIN) - DeleteCriticalSection(&lock->cs); -#else -#warning "locking not implemented in this platform" -#endif -} - -static void plugin_lock(plugin_lock_t *lock) -{ - assert(lock); - -#if defined(HAVE_PTHREAD) - pthread_mutex_lock(&lock->mutex); -#elif defined(XP_WIN) - EnterCriticalSection(&lock->cs); -#else -#warning "locking not implemented in this platform" -#endif -} - -static void plugin_unlock(plugin_lock_t *lock) -{ - assert(lock); - -#if defined(HAVE_PTHREAD) - pthread_mutex_unlock(&lock->mutex); -#elif defined(XP_WIN) - LeaveCriticalSection(&lock->cs); -#else -#warning "locking not implemented in this platform" -#endif -} - -#endif diff --git a/npapi/utils.hpp b/npapi/utils.hpp index e4cb76e..361a145 100644 --- a/npapi/utils.hpp +++ b/npapi/utils.hpp @@ -27,7 +27,9 @@ #include <npruntime.h> #include <memory> #include <type_traits> + #include <cstring> +#include <cassert> using CStr = std::unique_ptr<char, void(*)(void*)>; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
