Merge from Git repository

--HG-- branch : develop
5 years ago · dc1bd19f61
parent a53051c316 a138c727b7
commit dc1bd19f61
2 changed files with 5 additions and 1 deletions
--- a/code/nelns/admin_service/admin_service.cpp
+++ b/code/nelns/admin_service/admin_service.cpp
@ -38,7 +38,9 @@ typedef unsigned long ulong;
 #endif
 #include <mysql.h>
 #ifndef LIBMARIADB
 #include <mysql_version.h>
 #endif
 #include "nel/misc/debug.h"
 #include "nel/misc/config_file.h"
--- a/code/nelns/login_service/mysql_helper.cpp
+++ b/code/nelns/login_service/mysql_helper.cpp
@ -20,7 +20,9 @@
 #include "mysql_helper.h"
-#include "mysql_version.h"
+#ifndef LIBMARIADB
 #include <mysql_version.h>
 #endif
 //