summaryrefslogtreecommitdiffstats
path: root/src/sockets
diff options
context:
space:
mode:
authorLubos Dolezel <lubos@dolezel.info>2015-06-01 16:38:53 +0200
committerLubos Dolezel <lubos@dolezel.info>2015-06-01 16:38:53 +0200
commit2142a3eaa4c1eb99aa1e4c7d95a4e1115bc4c689 (patch)
treed5e801c683f59a4471ba9d64f2b22ab7908a8b8b /src/sockets
parent545703d60acb8b0245e3d79e5dfd7171ca10c572 (diff)
downloadtwinkle-2142a3eaa4c1eb99aa1e4c7d95a4e1115bc4c689.tar
twinkle-2142a3eaa4c1eb99aa1e4c7d95a4e1115bc4c689.tar.gz
twinkle-2142a3eaa4c1eb99aa1e4c7d95a4e1115bc4c689.tar.lz
twinkle-2142a3eaa4c1eb99aa1e4c7d95a4e1115bc4c689.tar.xz
twinkle-2142a3eaa4c1eb99aa1e4c7d95a4e1115bc4c689.zip
Many submodules building (no gui yet), with link-time errors
Diffstat (limited to 'src/sockets')
-rw-r--r--src/sockets/CMakeLists.txt12
-rw-r--r--src/sockets/socket.cpp10
2 files changed, 17 insertions, 5 deletions
diff --git a/src/sockets/CMakeLists.txt b/src/sockets/CMakeLists.txt
new file mode 100644
index 0000000..a940b40
--- /dev/null
+++ b/src/sockets/CMakeLists.txt
@@ -0,0 +1,12 @@
+project(libtwinkle-sockets)
+
+set(LIBTWINKLE_SOCKETS-SRCS
+ connection.cpp
+ connection_table.cpp
+ dnssrv.cpp
+ interfaces.cpp
+ socket.cpp
+ url.cpp
+)
+
+add_library(libtwinkle-sockets OBJECT ${LIBTWINKLE_SOCKETS-SRCS})
diff --git a/src/sockets/socket.cpp b/src/sockets/socket.cpp
index 87bdc27..a56d273 100644
--- a/src/sockets/socket.cpp
+++ b/src/sockets/socket.cpp
@@ -24,15 +24,15 @@
#include "socket.h"
#include "audits/memman.h"
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#if HAVE_LINUX_TYPES_H
+#ifdef HAVE_LINUX_TYPES_H
#include <linux/types.h>
#endif
-#if HAVE_LINUX_ERRQUEUE_H
+#ifdef HAVE_LINUX_ERRQUEUE_H
#include <linux/errqueue.h>
#endif
@@ -185,7 +185,7 @@ bool t_socket_udp::select_read(unsigned long timeout) {
}
bool t_socket_udp::enable_icmp(void) {
-#if HAVE_LINUX_ERRQUEUE_H
+#ifdef HAVE_LINUX_ERRQUEUE_H
int enable = 1;
int ret = setsockopt(SOL_IP, IP_RECVERR, &enable, sizeof(int));
if (ret < 0) return false;
@@ -196,7 +196,7 @@ bool t_socket_udp::enable_icmp(void) {
}
bool t_socket_udp::get_icmp(t_icmp_msg &icmp) {
-#if HAVE_LINUX_ERRQUEUE_H
+#ifdef HAVE_LINUX_ERRQUEUE_H
int ret;
char buf[256];