X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fcompat%2Fuuid.h;h=80e65260c25aa9dec772c2265f9120b89ce9f581;hp=c41cc3ec1fc902240ac648c60f50fdc457d0b702;hb=6c3e878478503a766ef482785ce3b61acb9e5767;hpb=f6afb94e88f4fb2a47384559fe14ad82a3ec7f20

diff --git a/include/babeltrace/compat/uuid.h b/include/babeltrace/compat/uuid.h
index c41cc3ec..80e65260 100644
--- a/include/babeltrace/compat/uuid.h
+++ b/include/babeltrace/compat/uuid.h
@@ -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>