Moved header colliding with <memory> to unique file that requires it

6 years ago · e703178f04
parent f5c71fa63d
commit e703178f04
2 changed files with 2 additions and 1 deletions
--- a/include/proxysql.h
+++ b/include/proxysql.h
@ -51,7 +51,6 @@

 #if !defined(__FreeBSD__) && !defined(__APPLE__)
 #define HAVE_BOOL
-#include "ma_global.h"
 //#include "my_pthread.h"
 #endif
 #include "mysql.h"
--- a/lib/MySQL_Protocol.cpp
+++ b/lib/MySQL_Protocol.cpp
@ -10,6 +10,8 @@

 #include <sstream>

+#include <ma_global.h>
+
 extern MySQL_Authentication *GloMyAuth;
 extern MySQL_LDAP_Authentication *GloMyLdapAuth;
 extern MySQL_Threads_Handler *GloMTH;