X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fcompat%2Fuuid.h;h=369e47806e1471425e8629dbde2e611fbbaf4beb;hb=3842465694945829d76452ff83924aa0103c6293;hp=c41cc3ec1fc902240ac648c60f50fdc457d0b702;hpb=9d1e7de0dd0572e8071e0bd620c1c569e8b5396b;p=deliverable%2Fbabeltrace.git

diff --git a/include/babeltrace/compat/uuid.h b/include/babeltrace/compat/uuid.h
index c41cc3ec1..369e47806 100644
--- a/include/babeltrace/compat/uuid.h
+++ b/include/babeltrace/compat/uuid.h
@@ -25,8 +25,6 @@
  * SOFTWARE.
  */
 
-#include <config.h>
-
 /* Includes final \0. */
 #define BABELTRACE_UUID_STR_LEN		37
 #define BABELTRACE_UUID_LEN		16
@@ -35,40 +33,64 @@
 #include <uuid/uuid.h>
 
 static inline
-int babeltrace_uuid_generate(unsigned char *uuid_out)
+int bt_uuid_generate(unsigned char *uuid_out)
 {
 	uuid_generate(uuid_out);
 	return 0;
 }
 
+/* Sun's libuuid lacks const qualifiers */
+#if defined(__sun__)
+static inline
+int bt_uuid_unparse(const unsigned char *uuid_in, char *str_out)
+{
+	uuid_unparse((unsigned char *) uuid_in, str_out);
+	return 0;
+}
+
+static inline
+int bt_uuid_parse(const char *str_in, unsigned char *uuid_out)
+{
+	return uuid_parse((char *) str_in, uuid_out);
+}
+
+static inline
+int bt_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)
+int bt_uuid_unparse(const unsigned char *uuid_in, char *str_out)
 {
 	uuid_unparse(uuid_in, str_out);
 	return 0;
 }
 
 static inline
-int babeltrace_uuid_parse(const char *str_in, unsigned char *uuid_out)
+int bt_uuid_parse(const char *str_in, unsigned char *uuid_out)
 {
 	return uuid_parse(str_in, uuid_out);
 }
 
 static inline
-int babeltrace_uuid_compare(const unsigned char *uuid_a,
+int bt_uuid_compare(const unsigned char *uuid_a,
 		const unsigned char *uuid_b)
 {
 	return uuid_compare(uuid_a, uuid_b);
 }
+#endif
 
-#elif defined(BABELTRACE_HAVE_LIBC_UUID)
+#elif defined(BT_HAVE_LIBC_UUID)
 #include <uuid.h>
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 
 static inline
-int babeltrace_uuid_generate(unsigned char *uuid_out)
+int bt_uuid_generate(unsigned char *uuid_out)
 {
 	uint32_t status;
 
@@ -80,7 +102,7 @@ int babeltrace_uuid_generate(unsigned char *uuid_out)
 }
 
 static inline
-int babeltrace_uuid_unparse(const unsigned char *uuid_in, char *str_out)
+int bt_uuid_unparse(const unsigned char *uuid_in, char *str_out)
 {
 	uint32_t status;
 	char *alloc_str;
@@ -98,7 +120,7 @@ int babeltrace_uuid_unparse(const unsigned char *uuid_in, char *str_out)
 }
 
 static inline
-int babeltrace_uuid_parse(const char *str_in, unsigned char *uuid_out)
+int bt_uuid_parse(const char *str_in, unsigned char *uuid_out)
 {
 	uint32_t status;
 
@@ -110,7 +132,7 @@ int babeltrace_uuid_parse(const char *str_in, unsigned char *uuid_out)
 }
 
 static inline
-int babeltrace_uuid_compare(const unsigned char *uuid_a,
+int bt_uuid_compare(const unsigned char *uuid_a,
 		const unsigned char *uuid_b)
 {
 	uint32_t status;
@@ -124,10 +146,10 @@ int babeltrace_uuid_compare(const unsigned char *uuid_a,
 
 #elif defined(__MINGW32__)
 
-int babeltrace_uuid_generate(unsigned char *uuid_out);
-int babeltrace_uuid_unparse(const unsigned char *uuid_in, char *str_out);
-int babeltrace_uuid_parse(const char *str_in, unsigned char *uuid_out);
-int babeltrace_uuid_compare(const unsigned char *uuid_a,
+int bt_uuid_generate(unsigned char *uuid_out);
+int bt_uuid_unparse(const unsigned char *uuid_in, char *str_out);
+int bt_uuid_parse(const char *str_in, unsigned char *uuid_out);
+int bt_uuid_compare(const unsigned char *uuid_a,
 		const unsigned char *uuid_b);
 
 #else