summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt8
-rw-r--r--config.h.cmake1
-rw-r--r--src/network/poller.hpp6
3 files changed, 11 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 21e82b4..2c01ee3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,12 @@ include_directories(${ICONV_INCLUDE_DIR})
# coming from these headers.
include_directories(SYSTEM ${CRYPTO++_INCLUDE_DIR})
+set(POLLER "POLL" CACHE STRING
+ "Choose the poller between POLL and EPOLL (Linux-only)")
+if((NOT ${POLLER} MATCHES "POLL") AND
+ (NOT ${POLLER} MATCHES "EPOLL"))
+ message(FATAL_ERROR "POLLER must be either POLL or EPOLL")
+endif()
#
## utils
#
@@ -95,4 +101,4 @@ target_link_libraries(test
utils
config)
-CONFIGURE_FILE(config.h.cmake src/config.h @ONLY)
+configure_file(config.h.cmake src/config.h)
diff --git a/config.h.cmake b/config.h.cmake
index 5f0a3cb..e17cc80 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -1 +1,2 @@
#cmakedefine ICONV_SECOND_ARGUMENT_IS_CONST
+#cmakedefine POLLER ${POLLER}
diff --git a/src/network/poller.hpp b/src/network/poller.hpp
index e6ce7f2..fe52fda 100644
--- a/src/network/poller.hpp
+++ b/src/network/poller.hpp
@@ -9,11 +9,9 @@
#define POLL 1
#define EPOLL 2
#define KQUEUE 3
-
#include <config.h>
#ifndef POLLER
- // Default standard poller
- #define POLLER EPOLL
+ #define POLLER POLL
#endif
#if POLLER == POLL
@@ -21,6 +19,8 @@
#define MAX_POLL_FD_NUMBER 4096
#elif POLLER == EPOLL
#include <sys/epoll.h>
+#else
+ #error Invalid POLLER value
#endif
/**