From 65c2de396ce8202dc58704c6b1f1530dfcc30b59 Mon Sep 17 00:00:00 2001 From: Alexander Golubev Date: Tue, 9 Mar 2021 12:19:52 +0300 Subject: [PATCH] Fix compilation of mysql db backend against MariaDB MariaDB's connector-c by default provides mariadb_version.h instead of mysql_version.h header, However, it's inderectly included through mysql.h in both implementation: mariadb and mysql, so remove it's direct inclussion from the source. Signed-off-by: Alexander Golubev (cherry picked from commit 9c1eb0dc5e8696cdca48ddf233fa07d491d4943a) --- amarok/src/collectiondb.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp index 58ca0515..024779e4 100644 --- a/amarok/src/collectiondb.cpp +++ b/amarok/src/collectiondb.cpp @@ -76,7 +76,6 @@ #ifdef USE_MYSQL #include - #include #endif #ifdef USE_POSTGRESQL