From cb3213af6382c380df9fc47347764f087ae7ecb4 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Tue, 1 Mar 2016 12:56:39 +0200
Subject: [PATCH] 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                                        | 1 -
 server/core/dcb.c                                     | 2 +-
 server/core/gateway.c                                 | 2 +-
 server/core/modutil.c                                 | 1 +
 server/core/poll.c                                    | 2 +-
 server/core/server.c                                  | 2 +-
 server/core/service.c                                 | 2 +-
 server/core/test/testpoll.c                           | 2 +-
 server/core/test/testsession.c                        | 2 +-
 server/core/utils.c                                   | 2 +-
 server/include/{ => maxscale}/poll.h                  | 0
 server/include/test_utils.h                           | 2 +-
 server/modules/filter/tee.c                           | 2 +-
 server/modules/include/httpd.h                        | 2 +-
 server/modules/protocol/maxscaled.c                   | 2 +-
 server/modules/protocol/mysql_client.c                | 1 +
 server/modules/protocol/telnetd.c                     | 2 +-
 server/modules/routing/cli.c                          | 2 +-
 server/modules/routing/debugcli.c                     | 2 +-
 server/modules/routing/debugcmd.c                     | 3 +--
 server/modules/routing/maxinfo/maxinfo.c              | 2 +-
 server/modules/routing/maxinfo/maxinfo_error.c        | 2 +-
 server/modules/routing/maxinfo/maxinfo_exec.c         | 2 +-
 server/modules/routing/maxinfo/maxinfo_parse.c        | 2 +-
 server/modules/routing/schemarouter/schemarouter.c    | 1 +
 server/modules/routing/schemarouter/sharding_common.c | 1 +
 26 files changed, 24 insertions(+), 22 deletions(-)
 rename server/include/{ => maxscale}/poll.h (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5967b10e6..8476fdd12 100644
--- a/CMakeLists.txt
+++ b/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)
diff --git a/server/core/dcb.c b/server/core/dcb.c
index 319cee853..9675b66b7 100644
--- a/server/core/dcb.c
+++ b/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>
diff --git a/server/core/gateway.c b/server/core/gateway.c
index 5c4192275..d98f654c7 100644
--- a/server/core/gateway.c
+++ b/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>
diff --git a/server/core/modutil.c b/server/core/modutil.c
index 0773765e5..2f1646a8c 100644
--- a/server/core/modutil.c
+++ b/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 */
diff --git a/server/core/poll.c b/server/core/poll.c
index dde93e750..f37a713cb 100644
--- a/server/core/poll.c
+++ b/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>
diff --git a/server/core/server.c b/server/core/server.c
index 71d4991cb..2368414ea 100644
--- a/server/core/server.c
+++ b/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>
 
diff --git a/server/core/service.c b/server/core/service.c
index 62a6eaf3a..b741edc81 100644
--- a/server/core/service.c
+++ b/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>
diff --git a/server/core/test/testpoll.c b/server/core/test/testpoll.c
index 4c366d3ce..1b7871be1 100644
--- a/server/core/test/testpoll.c
+++ b/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>
 
diff --git a/server/core/test/testsession.c b/server/core/test/testsession.c
index bf068bd11..9227dea47 100644
--- a/server/core/test/testsession.c
+++ b/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>
 
 /**
diff --git a/server/core/utils.c b/server/core/utils.c
index f71b5a1e2..de15ca40b 100644
--- a/server/core/utils.c
+++ b/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>
diff --git a/server/include/poll.h b/server/include/maxscale/poll.h
similarity index 100%
rename from server/include/poll.h
rename to server/include/maxscale/poll.h
diff --git a/server/include/test_utils.h b/server/include/test_utils.h
index f94f60e00..894d96e58 100644
--- a/server/include/test_utils.h
+++ b/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>
diff --git a/server/modules/filter/tee.c b/server/modules/filter/tee.c
index 773347d69..29150180a 100644
--- a/server/modules/filter/tee.c
+++ b/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>
 
diff --git a/server/modules/include/httpd.h b/server/modules/include/httpd.h
index 0f9cbb7ad..46868f100 100644
--- a/server/modules/include/httpd.h
+++ b/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>
 
diff --git a/server/modules/protocol/maxscaled.c b/server/modules/protocol/maxscaled.c
index 9c37e93c8..fec6e1735 100644
--- a/server/modules/protocol/maxscaled.c
+++ b/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>
diff --git a/server/modules/protocol/mysql_client.c b/server/modules/protocol/mysql_client.c
index a98be6cce..c23becbf1 100644
--- a/server/modules/protocol/mysql_client.c
+++ b/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>
diff --git a/server/modules/protocol/telnetd.c b/server/modules/protocol/telnetd.c
index d9ff6bcf3..1c5ffb2e6 100644
--- a/server/modules/protocol/telnetd.c
+++ b/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>
diff --git a/server/modules/routing/cli.c b/server/modules/routing/cli.c
index 18a54ab3a..ef889d001 100644
--- a/server/modules/routing/cli.c
+++ b/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>
diff --git a/server/modules/routing/debugcli.c b/server/modules/routing/debugcli.c
index 3dcbe0a31..6d70fcdaf 100644
--- a/server/modules/routing/debugcli.c
+++ b/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>
diff --git a/server/modules/routing/debugcmd.c b/server/modules/routing/debugcmd.c
index 8000f1f41..6f498d89f 100644
--- a/server/modules/routing/debugcmd.c
+++ b/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>
diff --git a/server/modules/routing/maxinfo/maxinfo.c b/server/modules/routing/maxinfo/maxinfo.c
index 1bb98f8e0..72841cb4d 100644
--- a/server/modules/routing/maxinfo/maxinfo.c
+++ b/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>
diff --git a/server/modules/routing/maxinfo/maxinfo_error.c b/server/modules/routing/maxinfo/maxinfo_error.c
index afb4a6270..ecb8633d9 100644
--- a/server/modules/routing/maxinfo/maxinfo_error.c
+++ b/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>
diff --git a/server/modules/routing/maxinfo/maxinfo_exec.c b/server/modules/routing/maxinfo/maxinfo_exec.c
index 76fcd76b2..658aa45b6 100644
--- a/server/modules/routing/maxinfo/maxinfo_exec.c
+++ b/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>
diff --git a/server/modules/routing/maxinfo/maxinfo_parse.c b/server/modules/routing/maxinfo/maxinfo_parse.c
index 86dacdfa7..f4a85dc31 100644
--- a/server/modules/routing/maxinfo/maxinfo_parse.c
+++ b/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>
diff --git a/server/modules/routing/schemarouter/schemarouter.c b/server/modules/routing/schemarouter/schemarouter.c
index f07120908..c5236f66b 100644
--- a/server/modules/routing/schemarouter/schemarouter.c
+++ b/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
diff --git a/server/modules/routing/schemarouter/sharding_common.c b/server/modules/routing/schemarouter/sharding_common.c
index 3f188208c..c9b94c4c1 100644
--- a/server/modules/routing/schemarouter/sharding_common.c
+++ b/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.