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.

CMakeLists.txt

@@ -165,7 +165,6 @@ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-ggdb")
 
 include_directories(utils)
 include_directories(server/include)
-include_directories(server/include/maxscale)
 include_directories(server/inih)
 include_directories(server/modules/include)
 include_directories(${CMAKE_BINARY_DIR}/server/include)

server/core/dcb.c

@@ -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>

server/core/gateway.c

@@ -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>

server/core/modutil.c

@@ -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 */

server/core/poll.c

@@ -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>

server/core/server.c

@@ -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>
 

server/core/service.c

@@ -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>

server/core/test/testpoll.c

@@ -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>
 

server/core/test/testsession.c

@@ -38,7 +38,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <poll.h>
+#include <maxscale/poll.h>
 #include <dcb.h>
 
 /**

server/core/utils.c

@@ -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>

server/include/test_utils.h

@@ -1,6 +1,6 @@
 #ifndef TEST_UTILS_H
 #define TEST_UTILS_H
-#include <poll.h>
+#include <maxscale/poll.h>
 #include <dcb.h>
 #include <housekeeper.h>
 #include <maxscale_test.h>

server/modules/filter/tee.c

@@ -60,7 +60,7 @@
 #include <router.h>
 #include <dcb.h>
 #include <sys/time.h>
-#include <poll.h>
+#include <maxscale/poll.h>
 #include <mysql_client_server_protocol.h>
 #include <housekeeper.h>
 

server/modules/include/httpd.h

@@ -36,7 +36,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <router.h>
-#include <poll.h>
+#include <maxscale/poll.h>
 #include <atomic.h>
 #include <gw.h>
 

server/modules/protocol/maxscaled.c

@@ -29,7 +29,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <router.h>
-#include <poll.h>
+#include <maxscale/poll.h>
 #include <atomic.h>
 #include <gw.h>
 #include <adminusers.h>

server/modules/protocol/mysql_client.c

@@ -50,6 +50,7 @@
 #include <skygw_utils.h>
 #include <log_manager.h>
 #include <mysql_client_server_protocol.h>
+#include <maxscale/poll.h>
 #include <gw.h>
 #include <modinfo.h>
 #include <sys/stat.h>

server/modules/protocol/telnetd.c

@@ -29,7 +29,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <router.h>
-#include <poll.h>
+#include <maxscale/poll.h>
 #include <atomic.h>
 #include <gw.h>
 #include <telnetd.h>

server/modules/routing/cli.c

@@ -40,7 +40,7 @@
 #include <atomic.h>
 #include <spinlock.h>
 #include <dcb.h>
-#include <poll.h>
+#include <maxscale/poll.h>
 #include <debugcli.h>
 #include <skygw_utils.h>
 #include <log_manager.h>

server/modules/routing/debugcli.c

@@ -39,7 +39,7 @@
 #include <atomic.h>
 #include <spinlock.h>
 #include <dcb.h>
-#include <poll.h>
+#include <maxscale/poll.h>
 #include <debugcli.h>
 #include <skygw_utils.h>
 #include <log_manager.h>

server/modules/routing/debugcmd.c

@@ -63,7 +63,7 @@
 #include <spinlock.h>
 #include <buffer.h>
 #include <dcb.h>
-#include <poll.h>
+#include <maxscale/poll.h>
 #include <users.h>
 #include <dbusers.h>
 #include <maxconfig.h>
@@ -71,7 +71,6 @@
 #include <adminusers.h>
 #include <monitor.h>
 #include <debugcli.h>
-#include <poll.h>
 #include <housekeeper.h>
 
 #include <skygw_utils.h>

server/modules/routing/maxinfo/maxinfo.c

@@ -45,7 +45,7 @@
 #include <atomic.h>
 #include <spinlock.h>
 #include <dcb.h>
-#include <poll.h>
+#include <maxscale/poll.h>
 #include <maxinfo.h>
 #include <skygw_utils.h>
 #include <log_manager.h>

server/modules/routing/maxinfo/maxinfo_error.c

@@ -39,7 +39,7 @@
 #include <atomic.h>
 #include <spinlock.h>
 #include <dcb.h>
-#include <poll.h>
+#include <maxscale/poll.h>
 #include <maxinfo.h>
 #include <skygw_utils.h>
 #include <log_manager.h>

server/modules/routing/maxinfo/maxinfo_exec.c

@@ -42,7 +42,7 @@
 #include <atomic.h>
 #include <spinlock.h>
 #include <dcb.h>
-#include <poll.h>
+#include <maxscale/poll.h>
 #include <maxinfo.h>
 #include <skygw_utils.h>
 #include <log_manager.h>

server/modules/routing/maxinfo/maxinfo_parse.c

@@ -40,7 +40,7 @@
 #include <atomic.h>
 #include <spinlock.h>
 #include <dcb.h>
-#include <poll.h>
+#include <maxscale/poll.h>
 #include <maxinfo.h>
 #include <skygw_utils.h>
 #include <log_manager.h>

server/modules/routing/schemarouter/schemarouter.c

@@ -34,6 +34,7 @@
 #include <modinfo.h>
 #include <modutil.h>
 #include <mysql_client_server_protocol.h>
+#include <maxscale/poll.h>
 #include <pcre.h>
 
 #define DEFAULT_REFRESH_INTERVAL 30.0

server/modules/routing/schemarouter/sharding_common.c

@@ -17,6 +17,7 @@
  */
 
 #include <sharding_common.h>
+#include <maxscale/poll.h>
 
 /**
  * Extract the database name from a COM_INIT_DB or literal USE ... query.