oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

command/sticker, sticker/song: embed struct sticker_song_find_data in namespace

Browse Source 
Fixes `-Werror=odr`
This commit is contained in:
Max Kellermann 2018-08-09 12:57:47 +02:00
parent 01d3777574
commit 66fcd25b7e
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/StickerCommands.cxx
View File

@ -31,10 +31,12 @@
#include "util/StringAPI.hxx" #include "util/StringAPI.hxx"
#include "util/ScopeExit.hxx" #include "util/ScopeExit.hxx"
namespace {
struct sticker_song_find_data { struct sticker_song_find_data {
Response &r; Response &r;
const char *name; const char *name;
}; };
}
static void static void
sticker_song_find_print_cb(const LightSong &song, const char *value, sticker_song_find_print_cb(const LightSong &song, const char *value,

2
src/sticker/SongSticker.cxx
View File

@ -69,6 +69,7 @@ sticker_song_get(const LightSong &song)
return sticker_load("song", uri.c_str()); return sticker_load("song", uri.c_str());
} }
namespace {
struct sticker_song_find_data { struct sticker_song_find_data {
const Database *db; const Database *db;
const char *base_uri; const char *base_uri;
@ -78,6 +79,7 @@ struct sticker_song_find_data {
void *user_data); void *user_data);
void *user_data; void *user_data;
}; };
}
static void static void
sticker_song_find_cb(const char *uri, const char *value, void *user_data) sticker_song_find_cb(const char *uri, const char *value, void *user_data)