MXS-2067: Fix build failures

The luafilter didn't include the <mutex> header and mqfilter used the
wrong lock type.
This commit is contained in:
Markus Mäkelä 2018-09-29 00:07:13 +03:00
parent 0387736130
commit 77b53b0889
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
2 changed files with 3 additions and 2 deletions

View File

@ -43,6 +43,7 @@
#include <lua.h>
#include <lualib.h>
#include <string.h>
#include <mutex>
#include <maxscale/alloc.h>
#include <maxscale/filter.h>
#include <maxscale/log.h>

View File

@ -212,8 +212,8 @@ typedef struct
int conn_stat; /**state of the connection to the server*/
int rconn_intv; /**delay for reconnects, in seconds*/
time_t last_rconn; /**last reconnect attempt*/
std::mutex rconn_lock;
std::mutex msg_lock;
pthread_mutex_t rconn_lock;
pthread_mutex_t msg_lock;
mqmessage* messages;
enum log_trigger_t trgtype;
SRC_TRIG* src_trg;