niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

undo breakage of OpenIndiana (Solaris) build

Browse source 
Signed-off-by: Erik Boasson <eb@ilities.com>
This commit is contained in:
Erik Boasson 2019-01-09 11:15:11 +01:00
parent de3d3cc8cd
commit d659b416f2
4 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/CMakeLists.txt
View file

@ -53,11 +53,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "VxWorks")
endif() endif()
if(${CMAKE_C_COMPILER_ID} STREQUAL "SunPro") if(${CMAKE_C_COMPILER_ID} STREQUAL "SunPro")
add_definitions(-m64) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -m64 -xc99 -D__restrict=restrict")
add_definitions(-xc99)
add_definitions(-D__restrict=restrict)
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -m64")
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -m64")
endif() endif()
# Conan # Conan

10
src/core/ddsi/src/ddsi_udp.c
View file

@ -64,8 +64,13 @@ static ssize_t ddsi_udp_conn_read (ddsi_tran_conn_t conn, unsigned char * buf, s
msghdr.msg_namelen = srclen; msghdr.msg_namelen = srclen;
msghdr.msg_iov = &msg_iov; msghdr.msg_iov = &msg_iov;
msghdr.msg_iovlen = 1; msghdr.msg_iovlen = 1;
#if !defined(__sun) || defined(_XPG4_2)
msghdr.msg_control = NULL; msghdr.msg_control = NULL;
msghdr.msg_controllen = 0; msghdr.msg_controllen = 0;
#else
msghdr.msg_accrights = NULL;
msghdr.msg_accrightslen = 0;
#endif
do { do {
ret = recvmsg(((ddsi_udp_conn_t) conn)->m_sock, &msghdr, 0); ret = recvmsg(((ddsi_udp_conn_t) conn)->m_sock, &msghdr, 0);
@ -117,8 +122,13 @@ static ssize_t ddsi_udp_conn_write (ddsi_tran_conn_t conn, const nn_locator_t *d
set_msghdr_iov (&msg, (os_iovec_t *) iov, niov); set_msghdr_iov (&msg, (os_iovec_t *) iov, niov);
msg.msg_name = &dstaddr; msg.msg_name = &dstaddr;
msg.msg_namelen = (socklen_t) os_sockaddr_get_size((os_sockaddr *) &dstaddr); msg.msg_namelen = (socklen_t) os_sockaddr_get_size((os_sockaddr *) &dstaddr);
#if !defined(__sun) || defined(_XPG4_2)
msg.msg_control = NULL; msg.msg_control = NULL;
msg.msg_controllen = 0; msg.msg_controllen = 0;
#else
msg.msg_accrights = NULL;
msg.msg_accrightslen = 0;
#endif
#if SYSDEPS_MSGHDR_FLAGS #if SYSDEPS_MSGHDR_FLAGS
msg.msg_flags = (int) flags; msg.msg_flags = (int) flags;
#else #else

2
src/os/CMakeLists.txt
View file

@ -95,7 +95,7 @@ endif()
if(${CMAKE_C_COMPILER_ID} STREQUAL "SunPro") if(${CMAKE_C_COMPILER_ID} STREQUAL "SunPro")
target_link_libraries(OSAPI INTERFACE -lsocket -lnsl) target_link_libraries(OSAPI INTERFACE -lsocket -lnsl)
target_compile_definitions(OSAPI PRIVATE -KPIC) add_definitions(-KPIC)
endif() endif()
# Determine if platform is big or little endian. # Determine if platform is big or little endian.

2
src/os/include/os/posix/os_platform_socket.h
View file

@ -74,8 +74,6 @@ extern "C" {
typedef size_t os_iov_len_t; typedef size_t os_iov_len_t;
#if defined(__sun) && !defined(_XPG4_2) #if defined(__sun) && !defined(_XPG4_2)
#define msg_accrights msg_control
#define msg_accrightslen msg_controllen
#define OS_MSGHDR_FLAGS 0 #define OS_MSGHDR_FLAGS 0
#else #else
#define OS_MSGHDR_FLAGS 1 #define OS_MSGHDR_FLAGS 1