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:
@ -28,16 +28,16 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <dcb.h>
|
||||
#include <service.h>
|
||||
#include <users.h>
|
||||
#include <skygw_utils.h>
|
||||
#include <log_manager.h>
|
||||
#include <secrets.h>
|
||||
#include <dbusers.h>
|
||||
#include <maxscale/dcb.h>
|
||||
#include <maxscale/service.h>
|
||||
#include <maxscale/users.h>
|
||||
#include <maxscale/skygw_utils.h>
|
||||
#include <maxscale/log_manager.h>
|
||||
#include <maxscale/secrets.h>
|
||||
#include <maxscale/dbusers.h>
|
||||
#include <mysql_client_server_protocol.h>
|
||||
#include <mysql_auth.h>
|
||||
#include <listener.h>
|
||||
#include <maxscale/listener.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <maxscale/alloc.h>
|
||||
|
||||
|
@ -34,8 +34,8 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <gwdirs.h>
|
||||
#include <adminusers.h>
|
||||
#include <maxscale/gwdirs.h>
|
||||
#include <maxscale/adminusers.h>
|
||||
#include <maxscale/alloc.h>
|
||||
|
||||
|
||||
|
@ -34,8 +34,8 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <maxscale/alloc.h>
|
||||
#include <buffer.h>
|
||||
#include <hint.h>
|
||||
#include <maxscale/buffer.h>
|
||||
#include <maxscale/hint.h>
|
||||
|
||||
/**
|
||||
* Generate predefined test data
|
||||
|
@ -32,8 +32,8 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <listener.h>
|
||||
#include <dcb.h>
|
||||
#include <maxscale/listener.h>
|
||||
#include <maxscale/dcb.h>
|
||||
|
||||
/**
|
||||
* test1 Allocate a dcb and do lots of other things
|
||||
|
@ -34,17 +34,17 @@
|
||||
#include <my_config.h>
|
||||
#include <mysql.h>
|
||||
#include <stdio.h>
|
||||
#include <notification.h>
|
||||
#include <maxscale/notification.h>
|
||||
#include <stdint.h>
|
||||
#include <stdbool.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <maxscale/alloc.h>
|
||||
#include <housekeeper.h>
|
||||
#include <buffer.h>
|
||||
#include <maxscale/housekeeper.h>
|
||||
#include <maxscale/buffer.h>
|
||||
#include <regex.h>
|
||||
#include <modules.h>
|
||||
#include <maxscale_test.h>
|
||||
#include <maxscale/modules.h>
|
||||
#include <maxscale/maxscale_test.h>
|
||||
|
||||
static char* server_options[] =
|
||||
{
|
||||
|
@ -33,7 +33,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <filter.h>
|
||||
#include <maxscale/filter.h>
|
||||
|
||||
|
||||
/**
|
||||
|
@ -33,9 +33,9 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <gwbitmask.h>
|
||||
#include <maxscale/gwbitmask.h>
|
||||
|
||||
#include <skygw_debug.h>
|
||||
#include <maxscale/skygw_debug.h>
|
||||
|
||||
/**
|
||||
* test1 Create a bitmap and mess around with it
|
||||
|
@ -36,8 +36,8 @@
|
||||
#include <time.h>
|
||||
|
||||
#include <maxscale/alloc.h>
|
||||
#include <atomic.h>
|
||||
#include <hashtable.h>
|
||||
#include <maxscale/atomic.h>
|
||||
#include <maxscale/hashtable.h>
|
||||
|
||||
static void
|
||||
read_lock(HASHTABLE *table)
|
||||
|
@ -33,7 +33,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <hint.h>
|
||||
#include <maxscale/hint.h>
|
||||
#include <maxscale/alloc.h>
|
||||
|
||||
/**
|
||||
|
@ -15,8 +15,8 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <maxscale/alloc.h>
|
||||
#include <skygw_utils.h>
|
||||
#include <log_manager.h>
|
||||
#include <maxscale/skygw_utils.h>
|
||||
#include <maxscale/log_manager.h>
|
||||
|
||||
static void skygw_log_enable(int priority)
|
||||
{
|
||||
|
@ -16,8 +16,8 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <maxscale/alloc.h>
|
||||
#include <skygw_utils.h>
|
||||
#include <log_manager.h>
|
||||
#include <maxscale/skygw_utils.h>
|
||||
#include <maxscale/log_manager.h>
|
||||
|
||||
static void skygw_log_enable(int priority)
|
||||
{
|
||||
|
@ -19,7 +19,7 @@
|
||||
#include <iostream>
|
||||
#include <pthread.h>
|
||||
#include <semaphore.h>
|
||||
#include <log_manager.h>
|
||||
#include <maxscale/log_manager.h>
|
||||
|
||||
using std::cerr;
|
||||
using std::cout;
|
||||
|
@ -34,8 +34,8 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <maxscale/alloc.h>
|
||||
#include <maxscale_pcre2.h>
|
||||
#include <skygw_debug.h>
|
||||
#include <maxscale/maxscale_pcre2.h>
|
||||
#include <maxscale/skygw_debug.h>
|
||||
|
||||
#define test_assert(a, b) if(!(a)){fprintf(stderr, b);return 1;}
|
||||
|
||||
|
@ -33,7 +33,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <memlog.h>
|
||||
#include <maxscale/memlog.h>
|
||||
|
||||
/**
|
||||
* Count the number of lines in a file
|
||||
|
@ -34,8 +34,8 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <maxscale/alloc.h>
|
||||
#include <modutil.h>
|
||||
#include <buffer.h>
|
||||
#include <maxscale/modutil.h>
|
||||
#include <maxscale/buffer.h>
|
||||
|
||||
/**
|
||||
* test1 Allocate a service and do lots of other things
|
||||
|
@ -34,9 +34,9 @@
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <maxscale/poll.h>
|
||||
#include <dcb.h>
|
||||
#include <test_utils.h>
|
||||
#include <listener.h>
|
||||
#include <maxscale/dcb.h>
|
||||
#include <maxscale/test_utils.h>
|
||||
#include <maxscale/listener.h>
|
||||
|
||||
/**
|
||||
* test1 Allocate a service and do lots of other things
|
||||
|
@ -37,10 +37,10 @@ extern int debug_check_fail;
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <queuemanager.h>
|
||||
#include <random_jkiss.h>
|
||||
#include <test_utils.h>
|
||||
#include <hk_heartbeat.h>
|
||||
#include <maxscale/queuemanager.h>
|
||||
#include <maxscale/random_jkiss.h>
|
||||
#include <maxscale/test_utils.h>
|
||||
#include <maxscale/hk_heartbeat.h>
|
||||
#include <maxscale/alloc.h>
|
||||
|
||||
/**
|
||||
|
@ -34,8 +34,8 @@
|
||||
#include <string.h>
|
||||
|
||||
#include <maxscale/alloc.h>
|
||||
#include <server.h>
|
||||
#include <log_manager.h>
|
||||
#include <maxscale/server.h>
|
||||
#include <maxscale/log_manager.h>
|
||||
/**
|
||||
* test1 Allocate a server and do lots of other things
|
||||
*
|
||||
|
@ -32,10 +32,10 @@
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <maxscale_test.h>
|
||||
#include <test_utils.h>
|
||||
#include <service.h>
|
||||
#include <gwdirs.h>
|
||||
#include <maxscale/maxscale_test.h>
|
||||
#include <maxscale/test_utils.h>
|
||||
#include <maxscale/service.h>
|
||||
#include <maxscale/gwdirs.h>
|
||||
#include <maxscale/alloc.h>
|
||||
|
||||
/**
|
||||
|
@ -33,8 +33,8 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <spinlock.h>
|
||||
#include <thread.h>
|
||||
#include <maxscale/spinlock.h>
|
||||
#include <maxscale/thread.h>
|
||||
|
||||
|
||||
/**
|
||||
|
@ -33,9 +33,9 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <users.h>
|
||||
#include <maxscale/users.h>
|
||||
|
||||
#include "log_manager.h"
|
||||
#include <maxscale/log_manager.h>
|
||||
|
||||
/**
|
||||
* test1 Allocate table of users and mess around with it
|
||||
|
Reference in New Issue
Block a user