Include MariaDB Connector-C headers first

The MariaDB Connector-C headers that are built by MaxScale must be
included before any system headers.

Fixed code that explicitly included the <mysql.h> header to use the
<maxscale/protocol/mysql.h> wrapper instead.
This commit is contained in:
Markus Mäkelä 2018-02-07 11:41:16 +02:00
parent 6dbec397dc
commit 2181c9d240
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
3 changed files with 3 additions and 2 deletions

View File

@ -50,6 +50,7 @@ find_package(ASAN)
include(cmake/BuildPCRE2.cmake)
include_directories(BEFORE ${PCRE2_INCLUDE_DIRS})
include_directories(BEFORE ${MARIADB_CONNECTOR_INCLUDE_DIR})
# If the connector was not found, download and build it from source
if(NOT MARIADB_CONNECTOR_FOUND)

View File

@ -18,13 +18,13 @@
#include <maxscale/cdefs.h>
#include <mysql.h>
#include <openssl/sha.h>
#include <maxscale/config.h>
#include <maxscale/dcb.h>
#include <maxscale/server.h>
#include <maxscale/jansson.h>
#include <maxscale/protocol/mysql.h>
MXS_BEGIN_DECLS

View File

@ -15,7 +15,7 @@
#include <maxscale/cdefs.h>
#include <stdlib.h>
#include <stdint.h>
#include <mysql.h>
#include <maxscale/protocol/mysql.h>
#include <maxscale/server.h>
MXS_BEGIN_DECLS