Merge branch 'v0.15.x'

Conflicts:
	src/input/lastfm_input_plugin.c
	src/song_save.c
This commit is contained in:
Max Kellermann
2009-11-10 21:13:03 +01:00
3 changed files with 13 additions and 2 deletions

View File

@@ -27,6 +27,10 @@
#undef G_LOG_DOMAIN
#define G_LOG_DOMAIN "sticker"
#if SQLITE_VERSION_NUMBER < 3003009
#define sqlite3_prepare_v2 sqlite3_prepare
#endif
struct sticker {
GHashTable *table;
};