Introduce common SQLite header

The header declares the missing v2 handle closing function for older
versions of SQLite.
This commit is contained in:
Markus Mäkelä
2017-01-04 14:21:37 +02:00
parent 5a290cb0b8
commit 2e074f4eb4
4 changed files with 28 additions and 8 deletions

View File

@ -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 <sqlite3.h>
/**
* @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

View File

@ -18,7 +18,6 @@
#include <maxscale/protocol/mysql.h>
#include <maxscale/secrets.h>
#include <maxscale/mysql_utils.h>
#include <sqlite3.h>
#include "../gssapi_auth.h"
/** Default timeout is one minute */

View File

@ -18,7 +18,7 @@
#include <stdint.h>
#include <stddef.h>
#include <gssapi.h>
#include <sqlite3.h>
#include <maxscale/sqlite3.h>
MXS_BEGIN_DECLS

View File

@ -32,16 +32,11 @@
#include <maxscale/pcre2.h>
#include <maxavro.h>
#include <binlog_common.h>
#include <sqlite3.h>
#include <maxscale/sqlite3.h>
#include <maxscale/protocol/mysql.h>
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)
*/