support for building/running on OpenIndiana

Signed-off-by: Erik Boasson <eb@ilities.com>

src/CMakeLists.txt

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

src/core/ddsc/src/dds_publisher.c

@@ -11,6 +11,7 @@
  */
 #include <assert.h>
 #include <string.h>
+#include "dds/ddsrt/misc.h"
 #include "dds__listener.h"
 #include "dds__qos.h"
 #include "dds__err.h"

src/core/ddsc/src/dds_rhc.c

@@ -11,6 +11,7 @@
  */
 #include <assert.h>
 #include <string.h>
+#include <limits.h>
 
 #if HAVE_VALGRIND && ! defined (NDEBUG)
 #include <memcheck.h>

src/core/ddsc/src/dds_whc.c

@@ -15,6 +15,7 @@
 
 #include "dds/ddsrt/heap.h"
 #include "dds/ddsrt/sync.h"
+#include "dds/ddsrt/misc.h"
 #include "dds/ddsi/ddsi_serdata.h"
 #include "dds/ddsi/q_unused.h"
 #include "dds/ddsi/q_config.h"

src/core/ddsi/include/dds/ddsi/q_protocol.h

@@ -130,8 +130,10 @@ typedef struct Header {
 } Header_t;
 #if DDSRT_ENDIAN == DDSRT_LITTLE_ENDIAN
 #define NN_PROTOCOLID_AS_UINT32 (((uint32_t)'R' << 0) | ((uint32_t)'T' << 8) | ((uint32_t)'P' << 16) | ((uint32_t)'S' << 24))
-#else
+#elif DDSRT_ENDIAN == DDSRT_BIG_ENDIAN
 #define NN_PROTOCOLID_AS_UINT32 (((uint32_t)'R' << 24) | ((uint32_t)'T' << 16) | ((uint32_t)'P' << 8) | ((uint32_t)'S' << 0))
+#else
+#error "DDSRT_ENDIAN neither LITTLE nor BIG"
 #endif
 #define RTPS_MESSAGE_HEADER_SIZE (sizeof (Header_t))
 

src/core/ddsi/src/ddsi_ssl.c

@@ -13,6 +13,7 @@
 #include "dds/ddsi/ddsi_ssl.h"
 #include "dds/ddsi/q_config.h"
 #include "dds/ddsrt/log.h"
+#include "dds/ddsrt/misc.h"
 
 #ifdef DDSI_INCLUDE_SSL
 

src/core/ddsi/src/ddsi_udp.c

@@ -14,6 +14,7 @@
 #include "dds/ddsrt/atomics.h"
 #include "dds/ddsrt/heap.h"
 #include "dds/ddsrt/log.h"
+#include "dds/ddsrt/misc.h"
 #include "dds/ddsrt/sockets.h"
 #include "ddsi_eth.h"
 #include "dds/ddsi/ddsi_tran.h"

src/core/ddsi/src/q_addrset.c

@@ -16,6 +16,7 @@
 #include "dds/ddsrt/heap.h"
 #include "dds/ddsrt/log.h"
 #include "dds/ddsrt/string.h"
+#include "dds/ddsrt/misc.h"
 #include "dds/util/ut_avl.h"
 #include "dds/ddsi/q_log.h"
 #include "dds/ddsi/q_misc.h"

src/core/ddsi/src/q_config.c

@@ -21,6 +21,7 @@
 #include "dds/ddsrt/log.h"
 #include "dds/ddsrt/string.h"
 #include "dds/ddsrt/strtod.h"
+#include "dds/ddsrt/misc.h"
 #include "dds/ddsi/q_config.h"
 #include "dds/ddsi/q_log.h"
 #include "dds/util/ut_avl.h"

src/core/ddsi/src/q_debmon.c

@@ -16,6 +16,7 @@
 #include "dds/ddsrt/heap.h"
 #include "dds/ddsrt/log.h"
 #include "dds/ddsrt/sync.h"
+#include "dds/ddsrt/misc.h"
 
 #include "dds/util/ut_avl.h"
 

src/core/ddsi/src/q_entity.c

@@ -18,6 +18,7 @@
 #include "dds/ddsrt/sockets.h"
 #include "dds/ddsrt/string.h"
 #include "dds/ddsrt/sync.h"
+#include "dds/ddsrt/misc.h"
 
 #include "dds/ddsi/q_entity.h"
 #include "dds/ddsi/q_config.h"

src/core/ddsi/src/q_ephash.c

@@ -13,6 +13,8 @@
 #include <assert.h>
 
 #include "dds/ddsrt/heap.h"
+#include "dds/ddsrt/misc.h"
+
 #include "dds/util/ut_hopscotch.h"
 #include "dds/ddsi/q_ephash.h"
 #include "dds/ddsi/q_config.h"

src/core/ddsi/src/q_freelist.c

@@ -12,6 +12,7 @@
 #include <stddef.h>
 
 #include "dds/ddsrt/atomics.h"
+#include "dds/ddsrt/misc.h"
 #include "dds/ddsrt/heap.h"
 #include "dds/ddsrt/sync.h"
 #include "dds/ddsrt/threads.h"

src/core/ddsi/src/q_thread.c

@@ -19,6 +19,7 @@
 #include "dds/ddsrt/string.h"
 #include "dds/ddsrt/sync.h"
 #include "dds/ddsrt/threads.h"
+#include "dds/ddsrt/misc.h"
 
 #include "dds/ddsi/q_thread.h"
 #include "dds/ddsi/q_servicelease.h"

src/core/ddsi/src/sysdeps.c

@@ -13,6 +13,7 @@
 #include <stdlib.h>
 
 #include "dds/ddsrt/atomics.h"
+#include "dds/ddsrt/misc.h"
 
 #include "dds/ddsi/q_error.h"
 #include "dds/ddsi/q_log.h"

src/ddsrt/include/dds/ddsrt/attributes.h

@@ -24,6 +24,10 @@
 # define ddsrt_clang (0)
 #endif
 
+#ifdef __SUNPRO_C
+# define __attribute__(x)
+#endif
+
 #if defined(__has_attribute)
 # define ddsrt_has_attribute(params) __has_attribute(params)
 #elif ddsrt_gnuc

src/ddsrt/include/dds/ddsrt/endian.h

@@ -32,6 +32,13 @@ extern "C" {
 #   elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 #     define DDSRT_ENDIAN DDSRT_LITTLE_ENDIAN
 #   endif
+# elif defined(__sun)
+#   include <sys/isa_defs.h>
+#   if defined(_BIG_ENDIAN)
+#     define DDSRT_ENDIAN DDSRT_BIG_ENDIAN
+#   elif defined(_LITTLE_ENDIAN)
+#     define DDSRT_ENDIAN DDSRT_LITTLE_ENDIAN
+#   endif
 # endif
 #endif /* _WIN32 */
 

src/ddsrt/src/sockets/posix/socket.c

@@ -23,6 +23,9 @@
 #endif /* __VXWORKS__ */
 #include <sys/types.h>
 #include <sys/socket.h>
+#ifdef __sun
+#include <fcntl.h>
+#endif
 
 #ifdef __APPLE__
 #include <sys/sockio.h>