Merge branch 'develop' into binlog_server_mariadb_master_encryption

server/modules/routing/binlog/blr.h

@@ -1,3 +1,4 @@
+#pragma once
 #ifndef _BLR_H
 #define _BLR_H
 /*
@@ -38,6 +39,8 @@
  *
  * @endverbatim
  */
+
+#include <maxscale/cdefs.h>
 #include <maxscale/dcb.h>
 #include <maxscale/buffer.h>
 #include <pthread.h>
@@ -48,6 +51,8 @@
 #include <maxscale/protocol/mysql.h>
 #include <maxscale/secrets.h>
 
+MXS_BEGIN_DECLS
+
 #define BINLOG_FNAMELEN         255
 #define BLR_PROTOCOL            "MySQLBackend"
 #define BINLOG_MAGIC            { 0xfe, 0x62, 0x69, 0x6e }
@@ -705,4 +710,6 @@ extern bool blr_send_event(blr_thread_role_t role,
                            REP_HEADER *hdr,
                            uint8_t *buf);
 
+MXS_END_DECLS
+
 #endif