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

diff --git a/include/babeltrace/compat/uuid.h b/include/babeltrace/compat/uuid.h
index 80e65260..369e4780 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,7 +33,7 @@
 #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;
@@ -44,20 +42,20 @@ int babeltrace_uuid_generate(unsigned char *uuid_out)
 /* 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 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((char *) 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((unsigned char *) uuid_a,
@@ -65,34 +63,34 @@ int babeltrace_uuid_compare(const unsigned char *uuid_a,
 }
 #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;
 
@@ -104,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;
@@ -122,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;
 
@@ -134,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;
@@ -148,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