Index: ossp-pkg/uuid/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/ChangeLog,v
rcsdiff -q -kk '-r1.8' '-r1.9' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/ChangeLog,v' 2>/dev/null
--- ChangeLog	2004/01/13 19:43:14	1.8
+++ ChangeLog	2004/01/13 19:48:01	1.9
@@ -13,6 +13,10 @@
 
   Changes between 0.9.0 and 0.9.1 (11-Jan-2004 to xx-Jan-2004)
 
+   o Make "md5_init" and "mac_address" symbols namespace clean
+     by adding correct embedding support via "uuid_" prefix.
+     [Ralf S. Engelschall]
+
    o Implement uuid_dump() and corresponding uuid CLI "-d"
      option for dumping a given UUID into clear text. For convinience
      reasons add uuid_bm.h (bit mask API) and uuid_str (string
Index: ossp-pkg/uuid/uuid_mac.h
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/uuid_mac.h,v
rcsdiff -q -kk '-r1.1' '-r1.2' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/uuid_mac.h,v' 2>/dev/null
--- uuid_mac.h	2004/01/10 17:01:22	1.1
+++ uuid_mac.h	2004/01/13 19:48:01	1.2
@@ -32,6 +32,20 @@
 
 #include <string.h> /* size_t */
 
+#define MAC_PREFIX uuid_
+
+/* embedding support */
+#ifdef MAC_PREFIX
+#if defined(__STDC__) || defined(__cplusplus)
+#define __MAC_CONCAT(x,y) x ## y
+#define MAC_CONCAT(x,y) __MAC_CONCAT(x,y)
+#else
+#define __MAC_CONCAT(x) x
+#define MAC_CONCAT(x,y) __MAC_CONCAT(x)y
+#endif
+#define mac_address MAC_CONCAT(MAC_PREFIX,mac_create)
+#endif
+
 #define MAC_LEN 6
 
 extern int mac_address(unsigned char *data_ptr, size_t data_len);
Index: ossp-pkg/uuid/uuid_md5.h
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/uuid_md5.h,v
rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/uuid_md5.h,v' 2>/dev/null
--- uuid_md5.h	2004/01/10 12:16:03	1.2
+++ uuid_md5.h	2004/01/13 19:48:01	1.3
@@ -46,6 +46,7 @@
 #define md5_st      MD5_CONCAT(MD5_PREFIX,md5_st)
 #define md5_t       MD5_CONCAT(MD5_PREFIX,md5_t)
 #define md5_create  MD5_CONCAT(MD5_PREFIX,md5_create)
+#define md5_init    MD5_CONCAT(MD5_PREFIX,md5_init)
 #define md5_update  MD5_CONCAT(MD5_PREFIX,md5_update)
 #define md5_store   MD5_CONCAT(MD5_PREFIX,md5_store)
 #define md5_format  MD5_CONCAT(MD5_PREFIX,md5_format)