From e7dc6a47d1a8a35a3a9060867eaacd638a1e1e31 Mon Sep 17 00:00:00 2001 From: Andrei Kholodnyi Date: Fri, 14 Mar 2025 15:05:47 +0100 Subject: [PATCH 1/6] add missing headers --- include/ur_client_library/comm/tcp_server.h | 5 +++++ include/ur_client_library/comm/tcp_socket.h | 1 + include/ur_client_library/exceptions.h | 1 + include/ur_client_library/queue/atomicops.h | 4 ++-- 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/include/ur_client_library/comm/tcp_server.h b/include/ur_client_library/comm/tcp_server.h index 66f113e47..8bad7d043 100644 --- a/include/ur_client_library/comm/tcp_server.h +++ b/include/ur_client_library/comm/tcp_server.h @@ -29,10 +29,15 @@ #ifndef UR_CLIENT_LIBRARY_TCP_SERVER_H_INCLUDED #define UR_CLIENT_LIBRARY_TCP_SERVER_H_INCLUDED +#include +#include +#include +#include #include #include #include #include +#include #include "ur_client_library/comm/socket_t.h" diff --git a/include/ur_client_library/comm/tcp_socket.h b/include/ur_client_library/comm/tcp_socket.h index 5a1d468c5..08bfdf8ae 100644 --- a/include/ur_client_library/comm/tcp_socket.h +++ b/include/ur_client_library/comm/tcp_socket.h @@ -19,6 +19,7 @@ */ #pragma once +#include #include #include #include diff --git a/include/ur_client_library/exceptions.h b/include/ur_client_library/exceptions.h index 125e41178..f5b03618c 100644 --- a/include/ur_client_library/exceptions.h +++ b/include/ur_client_library/exceptions.h @@ -29,6 +29,7 @@ #ifndef UR_CLIENT_LIBRARY_EXCEPTIONS_H_INCLUDED #define UR_CLIENT_LIBRARY_EXCEPTIONS_H_INCLUDED +#include #include #include #include diff --git a/include/ur_client_library/queue/atomicops.h b/include/ur_client_library/queue/atomicops.h index e4b248269..4e02a214c 100644 --- a/include/ur_client_library/queue/atomicops.h +++ b/include/ur_client_library/queue/atomicops.h @@ -408,7 +408,7 @@ __declspec(dllimport) int __stdcall ReleaseSemaphore(void* hSemaphore, long lRel } #elif defined(__MACH__) # include -#elif defined(__unix__) +#elif defined(__unix__) || defined(__VXWORKS__) # include #endif @@ -543,7 +543,7 @@ class Semaphore } } }; -#elif defined(__unix__) +#elif defined(__unix__) || defined(__VXWORKS__) //--------------------------------------------------------- // Semaphore (POSIX, Linux) //--------------------------------------------------------- From 57c22dad8fbb8dfa6a62f3580acd56a040777db4 Mon Sep 17 00:00:00 2001 From: Andrei Kholodnyi Date: Tue, 18 Mar 2025 19:27:48 +0100 Subject: [PATCH 2/6] conditional include with _WIN32 --- include/ur_client_library/comm/tcp_server.h | 2 -- include/ur_client_library/comm/tcp_socket.h | 2 ++ include/ur_client_library/exceptions.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/ur_client_library/comm/tcp_server.h b/include/ur_client_library/comm/tcp_server.h index 8bad7d043..01993360a 100644 --- a/include/ur_client_library/comm/tcp_server.h +++ b/include/ur_client_library/comm/tcp_server.h @@ -29,9 +29,7 @@ #ifndef UR_CLIENT_LIBRARY_TCP_SERVER_H_INCLUDED #define UR_CLIENT_LIBRARY_TCP_SERVER_H_INCLUDED -#include #include -#include #include #include #include diff --git a/include/ur_client_library/comm/tcp_socket.h b/include/ur_client_library/comm/tcp_socket.h index 08bfdf8ae..5db274cd3 100644 --- a/include/ur_client_library/comm/tcp_socket.h +++ b/include/ur_client_library/comm/tcp_socket.h @@ -19,7 +19,9 @@ */ #pragma once +#ifndef _WIN32 #include +#endif #include #include #include diff --git a/include/ur_client_library/exceptions.h b/include/ur_client_library/exceptions.h index f5b03618c..3e3ac106a 100644 --- a/include/ur_client_library/exceptions.h +++ b/include/ur_client_library/exceptions.h @@ -29,7 +29,6 @@ #ifndef UR_CLIENT_LIBRARY_EXCEPTIONS_H_INCLUDED #define UR_CLIENT_LIBRARY_EXCEPTIONS_H_INCLUDED -#include #include #include #include @@ -42,6 +41,8 @@ # ifdef ERROR # undef ERROR # endif // ERROR +#else +# include #endif namespace urcl From bb507e765559dcf5a1d247713ff8c7e4d40531b4 Mon Sep 17 00:00:00 2001 From: Andrei Kholodnyi Date: Tue, 18 Mar 2025 19:35:23 +0100 Subject: [PATCH 3/6] add conditional include _WIN32 --- include/ur_client_library/comm/tcp_server.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/ur_client_library/comm/tcp_server.h b/include/ur_client_library/comm/tcp_server.h index 01993360a..d407ee025 100644 --- a/include/ur_client_library/comm/tcp_server.h +++ b/include/ur_client_library/comm/tcp_server.h @@ -29,7 +29,9 @@ #ifndef UR_CLIENT_LIBRARY_TCP_SERVER_H_INCLUDED #define UR_CLIENT_LIBRARY_TCP_SERVER_H_INCLUDED +#ifndef _WIN32 #include +#endif #include #include #include From f9264983ee42926d5616c4f19ee84865e9eb455d Mon Sep 17 00:00:00 2001 From: Andrei Kholodnyi Date: Tue, 18 Mar 2025 19:40:01 +0100 Subject: [PATCH 4/6] conditional include with _WIN32 --- include/ur_client_library/comm/tcp_server.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/ur_client_library/comm/tcp_server.h b/include/ur_client_library/comm/tcp_server.h index d407ee025..3abd42f7f 100644 --- a/include/ur_client_library/comm/tcp_server.h +++ b/include/ur_client_library/comm/tcp_server.h @@ -31,8 +31,8 @@ #ifndef _WIN32 #include -#endif #include +#endif #include #include #include From 58a921c60f16f5c80396cad10e483fe947a98f73 Mon Sep 17 00:00:00 2001 From: Andrei Kholodnyi Date: Tue, 18 Mar 2025 20:21:40 +0100 Subject: [PATCH 5/6] move UNIX headers to socket_t.h --- include/ur_client_library/comm/socket_t.h | 2 ++ include/ur_client_library/comm/tcp_server.h | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/ur_client_library/comm/socket_t.h b/include/ur_client_library/comm/socket_t.h index 9c1e980b0..e82168e60 100644 --- a/include/ur_client_library/comm/socket_t.h +++ b/include/ur_client_library/comm/socket_t.h @@ -46,7 +46,9 @@ static inline int ur_close(socket_t s) #else // _WIN32 +# include # include +# include # include # include # include diff --git a/include/ur_client_library/comm/tcp_server.h b/include/ur_client_library/comm/tcp_server.h index 3abd42f7f..238bea13e 100644 --- a/include/ur_client_library/comm/tcp_server.h +++ b/include/ur_client_library/comm/tcp_server.h @@ -29,10 +29,6 @@ #ifndef UR_CLIENT_LIBRARY_TCP_SERVER_H_INCLUDED #define UR_CLIENT_LIBRARY_TCP_SERVER_H_INCLUDED -#ifndef _WIN32 -#include -#include -#endif #include #include #include From e37ffd1ac8898a31bc8c1f212ee1fcf771eb4978 Mon Sep 17 00:00:00 2001 From: Andrei Kholodnyi Date: Tue, 18 Mar 2025 20:31:17 +0100 Subject: [PATCH 6/6] move UNIX headers to socket_t.h --- include/ur_client_library/comm/socket_t.h | 1 + include/ur_client_library/comm/tcp_socket.h | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/ur_client_library/comm/socket_t.h b/include/ur_client_library/comm/socket_t.h index e82168e60..79d2358c9 100644 --- a/include/ur_client_library/comm/socket_t.h +++ b/include/ur_client_library/comm/socket_t.h @@ -50,6 +50,7 @@ static inline int ur_close(socket_t s) # include # include # include +# include # include # include diff --git a/include/ur_client_library/comm/tcp_socket.h b/include/ur_client_library/comm/tcp_socket.h index 5db274cd3..5a1d468c5 100644 --- a/include/ur_client_library/comm/tcp_socket.h +++ b/include/ur_client_library/comm/tcp_socket.h @@ -19,9 +19,6 @@ */ #pragma once -#ifndef _WIN32 -#include -#endif #include #include #include