diff options
| author | Max Kellermann <max@duempel.org> | 2012-08-13 07:59:19 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2012-08-13 07:59:19 +0200 |
| commit | 3047bdf6531d6718239d1e2e0f201d0b8e54dba1 (patch) | |
| tree | 033d49c9b6749c368e432eaaef644e80037f3f0f | |
| parent | a0478f98af3fb53168bdffa666894dde87cfe597 (diff) | |
| parent | 12be9e818f01777283d49c8e37f618e4e9731371 (diff) | |
| download | mpd-3047bdf6531d6718239d1e2e0f201d0b8e54dba1.tar.gz mpd-3047bdf6531d6718239d1e2e0f201d0b8e54dba1.tar.xz mpd-3047bdf6531d6718239d1e2e0f201d0b8e54dba1.zip | |
Merge branch 'v0.17.x'
Conflicts:
NEWS
configure.ac
src/client_file.h
Diffstat (limited to '')
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | src/client_file.h | 2 |
2 files changed, 6 insertions, 3 deletions
@@ -1,7 +1,12 @@ ver 0.18 (2012/??/??) * improved decoder/output error reporting -ver 0.17.1 (2012/??/??) +ver 0.17.2 (2012/??/??) +* protocol: + - fix crash in local file check + + +ver 0.17.1 (2012/07/31) * protocol: - require appropriate permissions for searchadd{,pl} * tags: diff --git a/src/client_file.h b/src/client_file.h index 439235739..2dd07dede 100644 --- a/src/client_file.h +++ b/src/client_file.h @@ -20,7 +20,6 @@ #ifndef MPD_CLIENT_FILE_H #define MPD_CLIENT_FILE_H -#include "gcc.h" #include "gerror.h" #include <stdbool.h> @@ -37,7 +36,6 @@ struct client; * @param path_fs the absolute path name in filesystem encoding * @return true if access is allowed */ -gcc_pure bool client_allow_file(const struct client *client, const char *path_fs, GError **error_r); |