diff --git a/include/maxscale/sqlite3.h b/include/maxscale/sqlite3.h new file mode 100644 index 000000000..33681bed5 --- /dev/null +++ b/include/maxscale/sqlite3.h @@ -0,0 +1,26 @@ +#pragma once +/* + * Copyright (c) 2016 MariaDB Corporation Ab + * + * Use of this software is governed by the Business Source License included + * in the LICENSE.TXT file and at www.mariadb.com/bsl. + * + * Change Date: 2019-07-01 + * + * On the date above, in accordance with the Business Source License, use + * of this software will be governed by version 2 or later of the General + * Public License. + */ + +#include + +/** + * @file sqlite3.h + * + * Common SQLite defines + */ + +/** SQLite3 version 3.7.14 introduced the new v2 close interface */ +#if SQLITE_VERSION_NUMBER < 3007014 +#define sqlite3_close_v2 sqlite3_close +#endif diff --git a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c index 9b49e07eb..8cb3562ca 100644 --- a/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c +++ b/server/modules/authenticator/GSSAPI/GSSAPIAuth/gssapi_auth.c @@ -18,7 +18,6 @@ #include #include #include -#include #include "../gssapi_auth.h" /** Default timeout is one minute */ diff --git a/server/modules/authenticator/GSSAPI/gssapi_auth.h b/server/modules/authenticator/GSSAPI/gssapi_auth.h index cbb8335da..ea4dbf071 100644 --- a/server/modules/authenticator/GSSAPI/gssapi_auth.h +++ b/server/modules/authenticator/GSSAPI/gssapi_auth.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include MXS_BEGIN_DECLS diff --git a/server/modules/routing/avrorouter/avrorouter.h b/server/modules/routing/avrorouter/avrorouter.h index ff0b7bb93..f6dfbe075 100644 --- a/server/modules/routing/avrorouter/avrorouter.h +++ b/server/modules/routing/avrorouter/avrorouter.h @@ -32,16 +32,11 @@ #include #include #include -#include +#include #include MXS_BEGIN_DECLS -/** SQLite3 version 3.7.14 introduced the new v2 close interface */ -#if SQLITE_VERSION_NUMBER < 3007014 -#define sqlite3_close_v2 sqlite3_close -#endif - /** * How often to call the router status function (seconds) */