Index: ossp-pkg/uuid/ChangeLog
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/ChangeLog,v
rcsdiff -q -kk '-r1.44' '-r1.45' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/ChangeLog,v' 2>/dev/null
--- ChangeLog	2004/02/13 21:08:17	1.44
+++ ChangeLog	2004/02/16 09:13:58	1.45
@@ -11,6 +11,16 @@
   This is a list of all changes to OSSP uuid.
   For a more brief summary please have a look at the NEWS file.
 
+  Changes between 0.9.7 and 1.0.0 (13-Feb-2004 to 16-Feb-2004)
+
+   o Resolve namespace conflicts with GCC 3.4 internal pow10() and round()
+     functions within uuid_str.c.
+     [Ralf S. Engelschall]
+
+   o Fix buffer handling in "uuid_export(..., UUID_FMT_TXT, vp, ...)" in
+     case "vp" is not NULL.
+     [Fuyuki <fuyuki@nigredo.org>]
+
   Changes between 0.9.6 and 0.9.7 (11-Feb-2004 to 13-Feb-2004)
 
    o remove --with-rfc2518 option and functionality because
@@ -27,18 +37,18 @@
 
    o Add missing documentation entries for UUID_XXXX API constants and
      uuid_version() function.
-     [<fuyuki@nigredo.org>]
+     [Fuyuki <fuyuki@nigredo.org>]
 
    o Adjust references for new draft-mealling-uuid-urn-02.txt.
-     [<fuyuki@nigredo.org>]
+     [Fuyuki <fuyuki@nigredo.org>]
 
    o Replaced overlooked references to old
      uuid_{unpack,pack,parse,format,dump}() functions with their
      current uuid_{import,export}() replacements.
-     [<fuyuki@nigredo.org>]
+     [Fuyuki <fuyuki@nigredo.org>]
 
    o Fixed "uuid -h" command.
-     [<fuyuki@nigredo.org>]
+     [Fuyuki <fuyuki@nigredo.org>]
 
   Changes between 0.9.5 and 0.9.6 (06-Feb-2004 to 11-Feb-2004)
 
Index: ossp-pkg/uuid/THANKS
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/THANKS,v
rcsdiff -q -kk '-r1.4' '-r1.5' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/THANKS,v' 2>/dev/null
--- THANKS	2004/01/16 15:54:29	1.4
+++ THANKS	2004/02/16 09:13:58	1.5
@@ -13,6 +13,7 @@
 
     o  Matthias Andree             <matthias.andree@gmx.de>
     o  M. Daniel                   <mdaniel@scdi.com>
+    o  Fuyuki                      <fuyuki@nigredo.org>
     o  Thomas Lotterer             <thomas@lotterer.net>
     o  Michael Schloh              <michael@schloh.com>
     o  Guerry Semones              <guerry@tsunamiresearch.com>
Index: ossp-pkg/uuid/uuid.c
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/uuid.c,v
rcsdiff -q -kk '-r1.45' '-r1.46' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/uuid.c,v' 2>/dev/null
--- uuid.c	2004/02/13 21:01:41	1.45
+++ uuid.c	2004/02/16 09:13:58	1.46
@@ -611,7 +611,7 @@
             return UUID_RC_ARG;
         if (*data_len < out_len)
             return UUID_RC_MEM;
-        memcpy(*data_ptr, &out_ptr, out_len);
+        memcpy(*data_ptr, out_ptr, out_len);
     }
 
     return UUID_RC_OK;
Index: ossp-pkg/uuid/uuid_str.c
RCS File: /v/ossp/cvs/ossp-pkg/uuid/Attic/uuid_str.c,v
rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/uuid/Attic/uuid_str.c,v' 2>/dev/null
--- uuid_str.c	2004/01/18 19:22:54	1.2
+++ uuid_str.c	2004/02/16 09:13:58	1.3
@@ -482,7 +482,7 @@
 }
 
 static LDOUBLE
-abs_val(LDOUBLE value)
+math_abs(LDOUBLE value)
 {
     LDOUBLE result = value;
     if (value < 0)
@@ -491,7 +491,7 @@
 }
 
 static LDOUBLE
-pow10(int exponent)
+math_pow10(int exponent)
 {
     LDOUBLE result = 1;
     while (exponent > 0) {
@@ -502,7 +502,7 @@
 }
 
 static long
-round(LDOUBLE value)
+math_round(LDOUBLE value)
 {
     long intpart;
     intpart = (long) value;
@@ -536,7 +536,7 @@
 
     if (max < 0)
         max = 6;
-    ufvalue = abs_val(fvalue);
+    ufvalue = math_abs(fvalue);
     if (fvalue < 0)
         signvalue = '-';
     else if (flags & DP_F_PLUS)
@@ -553,11 +553,11 @@
 
     /* we "cheat" by converting the fractional part to integer by
        multiplying by a factor of 10 */
-    fracpart = round((pow10(max)) * (ufvalue - intpart));
+    fracpart = math_round((math_pow10(max)) * (ufvalue - intpart));
 
-    if (fracpart >= pow10(max)) {
+    if (fracpart >= math_pow10(max)) {
         intpart++;
-        fracpart -= (long)pow10(max);
+        fracpart -= (long)math_pow10(max);
     }
 
     /* convert integer part */