Skip to content

Commit e703178

Browse files
committed
Moved header colliding with <memory> to unique file that requires it
1 parent f5c71fa commit e703178

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

include/proxysql.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151

5252
#if !defined(__FreeBSD__) && !defined(__APPLE__)
5353
#define HAVE_BOOL
54-
#include "ma_global.h"
5554
//#include "my_pthread.h"
5655
#endif
5756
#include "mysql.h"

lib/MySQL_Protocol.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
#include <sstream>
1212

13+
#include <ma_global.h>
14+
1315
extern MySQL_Authentication *GloMyAuth;
1416
extern MySQL_LDAP_Authentication *GloMyLdapAuth;
1517
extern MySQL_Threads_Handler *GloMTH;

0 commit comments

Comments
 (0)