Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for Cygwin toolchain. #351

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/daemon/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/daemon/dlt-daemon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/daemon/dlt_daemon_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@
#include <syslog.h>
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>

#include <sys/socket.h> /* send() */

Expand Down
2 changes: 1 addition & 1 deletion src/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
1 change: 1 addition & 0 deletions src/shared/dlt_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
# include <io.h>
#else
# include <unistd.h> /* for read(), close() */
# include <fcntl.h>
# include <sys/time.h> /* for gettimeofday() */
#endif

Expand Down
1 change: 1 addition & 0 deletions src/tests/dlt-test-client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions src/tests/dlt-test-multi-process-client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/tests/dlt-test-multi-process.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions src/tests/dlt-test-stress-client.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down