diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-02 20:56:21 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-02 20:56:21 +0100 |
| commit | 51a2d09eb7fd8bc22a25e151878e6809b58bc21f (patch) | |
| tree | 64f87cab1f5d55a219fc3c9d3d2dac5d65e0aba5 /src/db | |
| parent | 22f0ef6d6b2d2c66def0e0e93442b01089e388e9 (diff) | |
| download | mpd-51a2d09eb7fd8bc22a25e151878e6809b58bc21f.tar.gz mpd-51a2d09eb7fd8bc22a25e151878e6809b58bc21f.tar.xz mpd-51a2d09eb7fd8bc22a25e151878e6809b58bc21f.zip | |
db_lock: convert to C++
Diffstat (limited to '')
| -rw-r--r-- | src/DatabaseLock.cxx (renamed from src/db_lock.c) | 4 | ||||
| -rw-r--r-- | src/DatabaseLock.hxx (renamed from src/db_lock.h) | 7 | ||||
| -rw-r--r-- | src/db/SimpleDatabasePlugin.cxx | 4 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/db_lock.c b/src/DatabaseLock.cxx index 53759673d..872b9bfd3 100644 --- a/src/db_lock.c +++ b/src/DatabaseLock.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ */ #include "config.h" -#include "db_lock.h" +#include "DatabaseLock.hxx" #include "gcc.h" #if GCC_CHECK_VERSION(4, 2) diff --git a/src/db_lock.h b/src/DatabaseLock.hxx index eed71eec0..6646fb43d 100644 --- a/src/db_lock.h +++ b/src/DatabaseLock.hxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -23,14 +23,13 @@ * multi-threading. */ -#ifndef MPD_DB_LOCK_H -#define MPD_DB_LOCK_H +#ifndef MPD_DB_LOCK_HXX +#define MPD_DB_LOCK_HXX #include "check.h" #include <glib.h> #include <assert.h> -#include <stdbool.h> extern GStaticMutex db_mutex; diff --git a/src/db/SimpleDatabasePlugin.cxx b/src/db/SimpleDatabasePlugin.cxx index 4b92da6cf..85d707f52 100644 --- a/src/db/SimpleDatabasePlugin.cxx +++ b/src/db/SimpleDatabasePlugin.cxx @@ -23,10 +23,10 @@ #include "DatabaseHelpers.hxx" #include "SongFilter.hxx" #include "DatabaseSave.hxx" +#include "DatabaseLock.hxx" +#include "db_error.h" extern "C" { -#include "db_error.h" -#include "db_lock.h" #include "conf.h" } |