X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=include%2Fbabeltrace%2Fcompat%2Fuuid.h;h=65a72704b04f9712592c7ce8bc0235a2819bc187;hp=2ce74670796506645c1527d48743e8f0f06d6a22;hb=72a3bc16d8ecc59e593f5cfec4622cbc7fb2f3fc;hpb=4cb26dfbd763c06d99bf1069e2d1f3a569858e32

diff --git a/include/babeltrace/compat/uuid.h b/include/babeltrace/compat/uuid.h
index 2ce74670..65a72704 100644
--- a/include/babeltrace/compat/uuid.h
+++ b/include/babeltrace/compat/uuid.h
@@ -1,8 +1,8 @@
-#ifndef _BABELTRACE_UUID_H
-#define _BABELTRACE_UUID_H
+#ifndef _BABELTRACE_COMPAT_UUID_H
+#define _BABELTRACE_COMPAT_UUID_H
 
 /*
- * babeltrace/uuid.h
+ * babeltrace/compat/uuid.h
  *
  * Copyright (C) 2011   Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
@@ -35,40 +35,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 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((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 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 +104,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 +122,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 +134,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;
@@ -122,8 +146,16 @@ int babeltrace_uuid_compare(const unsigned char *uuid_a,
 		return -1;
 }
 
+#elif defined(__MINGW32__)
+
+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
 #error "Babeltrace needs to have a UUID generator configured."
 #endif
 
-#endif /* _BABELTRACE_UUID_H */
+#endif /* _BABELTRACE_COMPAT_UUID_H */