summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoctorNoobingstoneIPresume <47064117+DoctorNoobingstoneIPresume@users.noreply.github.com>2021-11-15 07:51:54 +0200
committerGitHub <noreply@github.com>2021-11-15 14:51:54 +0900
commitaa1364fbdf8700a2c3d2176180f92fb9a4b44251 (patch)
treef5a31839cd90d05b1c3f54c1099ff0f3be1539f7
parent68fb45019d04b637d5a51fbda411599ccf779dad (diff)
downloadDLT-daemon-aa1364fbdf8700a2c3d2176180f92fb9a4b44251.tar.gz
Support for Cygwin toolchain. (#351)
Also tested with the latest version running on Windows XP (gcc-5.4.0) (http://www.crouchingtigerhiddenfruitbat.org/cygwin/timemachine.html). Signed-off-by: Adder <adder_2003@yahoo.com>
-rw-r--r--src/daemon/CMakeLists.txt2
-rw-r--r--src/daemon/dlt-daemon.c2
-rw-r--r--src/daemon/dlt_daemon_common.c1
-rw-r--r--src/lib/CMakeLists.txt2
-rw-r--r--src/shared/dlt_common.c1
-rw-r--r--src/tests/dlt-test-client.c1
-rw-r--r--src/tests/dlt-test-multi-process-client.c1
-rw-r--r--src/tests/dlt-test-multi-process.c1
-rw-r--r--src/tests/dlt-test-stress-client.c1
-rw-r--r--tests/CMakeLists.txt2
10 files changed, 10 insertions, 4 deletions
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index adddee3..e4e96bd 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -45,7 +45,7 @@ if(WITH_DLT_SHM_ENABLE)
${PROJECT_SOURCE_DIR}/src/shared/dlt_shm.c)
endif()
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux|CYGWIN")
set(RT_LIBRARY rt)
set(SOCKET_LIBRARY "")
else()
diff --git a/src/daemon/dlt-daemon.c b/src/daemon/dlt-daemon.c
index 9678247..74f4049 100644
--- a/src/daemon/dlt-daemon.c
+++ b/src/daemon/dlt-daemon.c
@@ -1405,13 +1405,13 @@ static int dlt_daemon_init_fifo(DltDaemonLocal *daemon_local)
if (fcntl(fd, F_SETPIPE_SZ, daemon_local->daemonFifoSize) == -1)
dlt_vlog(LOG_ERR, "set FIFO size error: %s\n", strerror(errno));
}
-#endif
/* Get Daemon FIFO size */
if ((fifo_size = fcntl(fd, F_GETPIPE_SZ, 0)) == -1)
dlt_vlog(LOG_ERR, "get FIFO size error: %s\n", strerror(errno));
else
dlt_vlog(LOG_INFO, "FIFO size: %d\n", fifo_size);
+#endif
/* Early init, to be able to catch client (app) connections
* as soon as possible. This registration is automatically ignored
diff --git a/src/daemon/dlt_daemon_common.c b/src/daemon/dlt_daemon_common.c
index e56b751..6ba5935 100644
--- a/src/daemon/dlt_daemon_common.c
+++ b/src/daemon/dlt_daemon_common.c
@@ -72,6 +72,7 @@
#include <syslog.h>
#include <errno.h>
#include <unistd.h>
+#include <fcntl.h>
#include <sys/socket.h> /* send() */
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index fb5a2a4..3293376 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -29,7 +29,7 @@ endif()
add_library(dlt ${dlt_LIB_SRCS})
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux|CYGWIN")
set(RT_LIBRARY rt)
set(SOCKET_LIBRARY "")
else()
diff --git a/src/shared/dlt_common.c b/src/shared/dlt_common.c
index e964d1b..427044b 100644
--- a/src/shared/dlt_common.c
+++ b/src/shared/dlt_common.c
@@ -56,6 +56,7 @@
# include <io.h>
#else
# include <unistd.h> /* for read(), close() */
+# include <fcntl.h>
# include <sys/time.h> /* for gettimeofday() */
#endif
diff --git a/src/tests/dlt-test-client.c b/src/tests/dlt-test-client.c
index d1fbe0a..092b8f2 100644
--- a/src/tests/dlt-test-client.c
+++ b/src/tests/dlt-test-client.c
@@ -72,6 +72,7 @@
#include <sys/uio.h> /* for writev() */
#include <stdbool.h>
#include <limits.h>
+#include <fcntl.h>
#include "dlt_client.h"
#include "dlt_protocol.h"
diff --git a/src/tests/dlt-test-multi-process-client.c b/src/tests/dlt-test-multi-process-client.c
index 8853d57..ca06612 100644
--- a/src/tests/dlt-test-multi-process-client.c
+++ b/src/tests/dlt-test-multi-process-client.c
@@ -45,6 +45,7 @@
#include <string.h>
#include <stdio.h>
#include <unistd.h>
+#include <fcntl.h>
#include <ctype.h>
#include <stdlib.h>
#include <time.h>
diff --git a/src/tests/dlt-test-multi-process.c b/src/tests/dlt-test-multi-process.c
index 47f6059..90682a3 100644
--- a/src/tests/dlt-test-multi-process.c
+++ b/src/tests/dlt-test-multi-process.c
@@ -45,6 +45,7 @@
#include <stdio.h>
#include <ctype.h>
#include <unistd.h>
+#include <fcntl.h>
#include <limits.h>
#include <signal.h>
#include <errno.h>
diff --git a/src/tests/dlt-test-stress-client.c b/src/tests/dlt-test-stress-client.c
index 5cbfeba..5370caa 100644
--- a/src/tests/dlt-test-stress-client.c
+++ b/src/tests/dlt-test-stress-client.c
@@ -68,6 +68,7 @@
#include <ctype.h> /* for isprint() */
#include <stdlib.h> /* for atoi() */
#include <string.h> /* for strcmp() */
+#include <fcntl.h>
#include <sys/uio.h> /* for writev() */
#include "dlt_client.h"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a461891..b3a9339 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -15,7 +15,7 @@ else()
set(GTEST_LIBS ${GTEST_BOTH_LIBRARIES})
endif()
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if("${CMAKE_SYSTEM_NAME}" MATCHES "Linux|CYGWIN")
set(LIBRARIES "")
else()
set(LIBRARIES socket)