Port: Add Solaris libuuid compat
authorMichael Jeanson <mjeanson@efficios.com>
Mon, 28 Sep 2015 12:26:00 +0000 (08:26 -0400)
committerMichael Jeanson <mjeanson@efficios.com>
Fri, 16 Oct 2015 19:40:26 +0000 (15:40 -0400)
Solaris libuuid lack const qualifiers, add compat functions.

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
include/babeltrace/compat/uuid.h

index c41cc3ec1fc902240ac648c60f50fdc457d0b702..80e65260c25aa9dec772c2265f9120b89ce9f581 100644 (file)
@@ -41,6 +41,29 @@ int babeltrace_uuid_generate(unsigned char *uuid_out)
        return 0;
 }
 
+/* Sun's libuuid lacks const qualifiers */
+#if defined(__sun__)
+static inline
+int babeltrace_uuid_unparse(const unsigned char *uuid_in, char *str_out)
+{
+       uuid_unparse((unsigned char *) uuid_in, str_out);
+       return 0;
+}
+
+static inline
+int babeltrace_uuid_parse(const char *str_in, unsigned char *uuid_out)
+{
+       return uuid_parse((char *) str_in, uuid_out);
+}
+
+static inline
+int babeltrace_uuid_compare(const unsigned char *uuid_a,
+               const unsigned char *uuid_b)
+{
+       return uuid_compare((unsigned char *) uuid_a,
+               (unsigned char *) uuid_b);
+}
+#else
 static inline
 int babeltrace_uuid_unparse(const unsigned char *uuid_in, char *str_out)
 {
@@ -60,6 +83,7 @@ int babeltrace_uuid_compare(const unsigned char *uuid_a,
 {
        return uuid_compare(uuid_a, uuid_b);
 }
+#endif
 
 #elif defined(BABELTRACE_HAVE_LIBC_UUID)
 #include <uuid.h>
This page took 0.024406 seconds and 4 git commands to generate.