server/include/poll.h renamed to server/include/maxscale/poll.h
Due to an include conflict between /usr/include/poll.h and maxscale/server/include/poll.h the latter was moved to maxscale/server/include/maxscale/poll.h. Once 1.4 is out, all maxscale header files will be moved to that same sub-directory. That will prevent include conflicts and also make it easy to see which include files belong to maxscale and which do not.
This commit is contained in:
@ -79,7 +79,7 @@
|
||||
#include <router.h>
|
||||
#include <errno.h>
|
||||
#include <gw.h>
|
||||
#include <poll.h>
|
||||
#include <maxscale/poll.h>
|
||||
#include <atomic.h>
|
||||
#include <skygw_utils.h>
|
||||
#include <log_manager.h>
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
#include <session.h>
|
||||
#include <modules.h>
|
||||
#include <maxconfig.h>
|
||||
#include <poll.h>
|
||||
#include <maxscale/poll.h>
|
||||
#include <housekeeper.h>
|
||||
#include <service.h>
|
||||
#include <memlog.h>
|
||||
|
||||
@ -32,6 +32,7 @@
|
||||
#include <buffer.h>
|
||||
#include <string.h>
|
||||
#include <mysql_client_server_protocol.h>
|
||||
#include <maxscale/poll.h>
|
||||
#include <modutil.h>
|
||||
|
||||
/** These are used when converting MySQL wildcards to regular expressions */
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
#include <signal.h>
|
||||
#include <sys/epoll.h>
|
||||
#include <errno.h>
|
||||
#include <poll.h>
|
||||
#include <maxscale/poll.h>
|
||||
#include <dcb.h>
|
||||
#include <atomic.h>
|
||||
#include <gwbitmask.h>
|
||||
|
||||
@ -44,7 +44,7 @@
|
||||
#include <server.h>
|
||||
#include <spinlock.h>
|
||||
#include <dcb.h>
|
||||
#include <poll.h>
|
||||
#include <maxscale/poll.h>
|
||||
#include <skygw_utils.h>
|
||||
#include <log_manager.h>
|
||||
|
||||
|
||||
@ -56,7 +56,7 @@
|
||||
#include <users.h>
|
||||
#include <filter.h>
|
||||
#include <dbusers.h>
|
||||
#include <poll.h>
|
||||
#include <maxscale/poll.h>
|
||||
#include <skygw_utils.h>
|
||||
#include <log_manager.h>
|
||||
#include <sys/stat.h>
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <poll.h>
|
||||
#include <maxscale/poll.h>
|
||||
#include <dcb.h>
|
||||
#include <test_utils.h>
|
||||
|
||||
|
||||
@ -38,7 +38,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#include <poll.h>
|
||||
#include <maxscale/poll.h>
|
||||
#include <dcb.h>
|
||||
|
||||
/**
|
||||
|
||||
@ -39,7 +39,7 @@
|
||||
#include <dcb.h>
|
||||
#include <session.h>
|
||||
#include <openssl/sha.h>
|
||||
#include <poll.h>
|
||||
#include <maxscale/poll.h>
|
||||
#include <skygw_utils.h>
|
||||
#include <log_manager.h>
|
||||
#include <secrets.h>
|
||||
|
||||
Reference in New Issue
Block a user