hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-2014 Move maxscale/jansson.h to maxbase/jansson.h

Browse Source
This commit is contained in:
Johan Wikman
2018-08-15 11:14:11 +03:00
parent f98cb0fe8d
commit 17418572f9
20 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/maxscale/authenticator.h
View File

@ -20,8 +20,8 @@
#include <maxscale/cdefs.h>
#include <maxbase/jansson.h>
#include <maxscale/buffer.h>
#include <maxscale/jansson.h>
MXS_BEGIN_DECLS

2
include/maxscale/config.h
View File

@ -23,8 +23,8 @@
#include <sys/utsname.h>
#include <time.h>
#include <maxbase/jansson.h>
#include <maxscale/modinfo.h>
#include <maxscale/jansson.h>
#include <maxscale/pcre2.h>
#include <maxscale/query_classifier.h>

2
include/maxscale/filter.h
View File

@ -18,12 +18,12 @@
#include <maxscale/cdefs.h>
#include <stdint.h>
#include <maxbase/jansson.h>
#include <maxscale/buffer.h>
#include <maxscale/config.h>
#include <maxscale/dcb.h>
#include <maxscale/routing.h>
#include <maxscale/session.h>
#include <maxscale/jansson.h>
MXS_BEGIN_DECLS

16
include/maxscale/jansson.h
View File

@ -1,16 +0,0 @@
#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/bsl11.
*
* Change Date: 2022-01-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 <maxscale/cdefs.h>
#include <jansson.h>

2
include/maxscale/jansson.hh
View File

@ -18,9 +18,9 @@
#include <sstream>
#include <string>
#include <maxbase/jansson.h>
#include <maxscale/alloc.h>
#include <maxscale/debug.h>
#include <maxscale/jansson.h>
#include <maxscale/utils.hh>
namespace std

2
include/maxscale/json_api.h
View File

@ -19,7 +19,7 @@
*/
#include <maxscale/cdefs.h>
#include <maxscale/jansson.h>
#include <maxbase/jansson.h>
MXS_BEGIN_DECLS

2
include/maxscale/listener.h
View File

@ -17,9 +17,9 @@
*/
#include <maxscale/cdefs.h>
#include <maxbase/jansson.h>
#include <maxscale/protocol.h>
#include <maxscale/ssl.h>
#include <maxscale/jansson.h>
MXS_BEGIN_DECLS

2
include/maxscale/log_manager.h
View File

@ -19,7 +19,7 @@
#include <syslog.h>
#include <unistd.h>
#include <maxscale/jansson.h>
#include <maxbase/jansson.h>
MXS_BEGIN_DECLS

2
include/maxscale/modulecmd.h
View File

@ -23,13 +23,13 @@
*/
#include <maxscale/cdefs.h>
#include <maxbase/jansson.h>
#include <maxscale/dcb.h>
#include <maxscale/filter.h>
#include <maxscale/monitor.h>
#include <maxscale/server.h>
#include <maxscale/service.h>
#include <maxscale/session.h>
#include <maxscale/jansson.h>
MXS_BEGIN_DECLS

2
include/maxscale/monitor.h
View File

@ -20,10 +20,10 @@
#include <openssl/sha.h>
#include <maxbase/jansson.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

2
include/maxscale/protocol.h
View File

@ -18,9 +18,9 @@
* The protocol module interface definition.
*/
#include <maxbase/jansson.h>
#include <maxscale/cdefs.h>
#include <maxscale/buffer.h>
#include <maxscale/jansson.h>
MXS_BEGIN_DECLS

2
include/maxscale/query_classifier.h
View File

@ -13,8 +13,8 @@
*/
#include <maxscale/cdefs.h>
#include <maxbase/jansson.h>
#include <maxscale/buffer.h>
#include <maxscale/jansson.h>
MXS_BEGIN_DECLS

2
include/maxscale/router.h
View File

@ -20,11 +20,11 @@
#include <stdint.h>
#include <maxbase/jansson.h>
#include <maxscale/buffer.h>
#include <maxscale/routing.h>
#include <maxscale/service.h>
#include <maxscale/session.h>
#include <maxscale/jansson.h>
MXS_BEGIN_DECLS

2
include/maxscale/server.h
View File

@ -19,9 +19,9 @@
*/
#include <maxscale/cdefs.h>
#include <maxbase/jansson.h>
#include <maxscale/config.h>
#include <maxscale/dcb.h>
#include <maxscale/jansson.h>
MXS_BEGIN_DECLS

2
include/maxscale/service.h
View File

@ -26,6 +26,7 @@
#include <openssl/err.h>
#include <openssl/dh.h>
#include <maxbase/jansson.h>
#include <maxscale/protocol.h>
#include <maxscale/spinlock.h>
#include <maxscale/dcb.h>
@ -33,7 +34,6 @@
#include <maxscale/listener.h>
#include <maxscale/filter.h>
#include <maxscale/config.h>
#include <maxscale/jansson.h>
MXS_BEGIN_DECLS

2
include/maxscale/session.h
View File

@ -21,11 +21,11 @@
#include <time.h>
#include <maxbase/atomic.h>
#include <maxbase/jansson.h>
#include <maxscale/dcb.h>
#include <maxscale/buffer.h>
#include <maxscale/log_manager.h>
#include <maxscale/spinlock.h>
#include <maxscale/jansson.h>
MXS_BEGIN_DECLS

2
include/maxscale/users.h
View File

@ -17,10 +17,10 @@
*/
#include <maxscale/cdefs.h>
#include <maxbase/jansson.h>
#include <maxscale/dcb.h>
#include <maxscale/listener.h>
#include <maxscale/service.h>
#include <maxscale/jansson.h>
#include <openssl/sha.h>
MXS_BEGIN_DECLS