Merge branch 'v0.17.x'

Conflicts:
	NEWS
	configure.ac
	src/client_file.h
This commit is contained in:
Max Kellermann
2012-08-13 07:59:19 +02:00
2 changed files with 6 additions and 3 deletions

View File

@@ -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);