Move headers from server/include to include/maxscale
- Headers now to be included as <maxscale/xyz.h> - First step, no cleanup of headers has been made. Only moving from one place to another + necessary modifications.
This commit is contained in:
@ -15,12 +15,12 @@
|
||||
* @file auroramon.c - Amazon RDS Aurora monitor
|
||||
*/
|
||||
|
||||
#include <modinfo.h>
|
||||
#include <thread.h>
|
||||
#include <monitor.h>
|
||||
#include <maxscale/modinfo.h>
|
||||
#include <maxscale/thread.h>
|
||||
#include <maxscale/monitor.h>
|
||||
#include <mysqld_error.h>
|
||||
#include <maxscale/alloc.h>
|
||||
#include <skygw_debug.h>
|
||||
#include <maxscale/skygw_debug.h>
|
||||
|
||||
static char *version_str = (char*)"V1.0.0";
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
||||
|
||||
|
||||
#include "galeramon.h"
|
||||
#include <dcb.h>
|
||||
#include <maxscale/dcb.h>
|
||||
#include <maxscale/alloc.h>
|
||||
|
||||
static void monitorMain(void *);
|
||||
|
@ -16,18 +16,18 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <monitor.h>
|
||||
#include <spinlock.h>
|
||||
#include <externcmd.h>
|
||||
#include <thread.h>
|
||||
#include <maxscale/monitor.h>
|
||||
#include <maxscale/spinlock.h>
|
||||
#include <maxscale/externcmd.h>
|
||||
#include <maxscale/thread.h>
|
||||
#include <mysql.h>
|
||||
#include <mysqld_error.h>
|
||||
#include <skygw_utils.h>
|
||||
#include <log_manager.h>
|
||||
#include <secrets.h>
|
||||
#include <dcb.h>
|
||||
#include <modinfo.h>
|
||||
#include <maxconfig.h>
|
||||
#include <maxscale/skygw_utils.h>
|
||||
#include <maxscale/log_manager.h>
|
||||
#include <maxscale/secrets.h>
|
||||
#include <maxscale/dcb.h>
|
||||
#include <maxscale/modinfo.h>
|
||||
#include <maxscale/maxconfig.h>
|
||||
|
||||
/**
|
||||
* @file galeramon.h - The Galera cluster monitor
|
||||
|
@ -26,7 +26,7 @@
|
||||
*/
|
||||
|
||||
#include "mmmon.h"
|
||||
#include <dcb.h>
|
||||
#include <maxscale/dcb.h>
|
||||
#include <maxscale/alloc.h>
|
||||
|
||||
static void monitorMain(void *);
|
||||
|
@ -16,18 +16,18 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <monitor.h>
|
||||
#include <spinlock.h>
|
||||
#include <thread.h>
|
||||
#include <maxscale/monitor.h>
|
||||
#include <maxscale/spinlock.h>
|
||||
#include <maxscale/thread.h>
|
||||
#include <mysql.h>
|
||||
#include <mysqld_error.h>
|
||||
#include <skygw_utils.h>
|
||||
#include <log_manager.h>
|
||||
#include <secrets.h>
|
||||
#include <dcb.h>
|
||||
#include <modinfo.h>
|
||||
#include <maxconfig.h>
|
||||
#include <externcmd.h>
|
||||
#include <maxscale/skygw_utils.h>
|
||||
#include <maxscale/log_manager.h>
|
||||
#include <maxscale/secrets.h>
|
||||
#include <maxscale/dcb.h>
|
||||
#include <maxscale/modinfo.h>
|
||||
#include <maxscale/maxconfig.h>
|
||||
#include <maxscale/externcmd.h>
|
||||
|
||||
/**
|
||||
* @file mmmon.h - The Multi-Master monitor
|
||||
|
@ -16,19 +16,19 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <monitor.h>
|
||||
#include <spinlock.h>
|
||||
#include <thread.h>
|
||||
#include <maxscale/monitor.h>
|
||||
#include <maxscale/spinlock.h>
|
||||
#include <maxscale/thread.h>
|
||||
#include <mysql.h>
|
||||
#include <mysqld_error.h>
|
||||
#include <skygw_utils.h>
|
||||
#include <log_manager.h>
|
||||
#include <secrets.h>
|
||||
#include <dcb.h>
|
||||
#include <modinfo.h>
|
||||
#include <maxconfig.h>
|
||||
#include <externcmd.h>
|
||||
#include <hashtable.h>
|
||||
#include <maxscale/skygw_utils.h>
|
||||
#include <maxscale/log_manager.h>
|
||||
#include <maxscale/secrets.h>
|
||||
#include <maxscale/dcb.h>
|
||||
#include <maxscale/modinfo.h>
|
||||
#include <maxscale/maxconfig.h>
|
||||
#include <maxscale/externcmd.h>
|
||||
#include <maxscale/hashtable.h>
|
||||
|
||||
/**
|
||||
* @file mysqlmon.h - The MySQL monitor
|
||||
|
@ -46,8 +46,8 @@
|
||||
*/
|
||||
|
||||
#include "../mysqlmon.h"
|
||||
#include <dcb.h>
|
||||
#include <modutil.h>
|
||||
#include <maxscale/dcb.h>
|
||||
#include <maxscale/modutil.h>
|
||||
#include <maxscale/alloc.h>
|
||||
|
||||
/** Column positions for SHOW SLAVE STATUS */
|
||||
|
Reference in New Issue
Block a user