RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Anders F. Björklund
  Root:   /v/rpm/cvs                       Email:  afb@rpm5.org
  Module: rpm                              Date:   06-Feb-2008 11:01:11
  Branch: HEAD                             Handle: 2008020610011100

  Modified files:
    rpm                     CHANGES
    rpm/rpmio               rpmuuid.c

  Log:
    workaround for "uuid_t" type conflict, between <unistd.h> and "uuid.h"

  Summary:
    Revision    Changes     Path
    1.2138      +1  -0      rpm/CHANGES
    2.3         +9  -0      rpm/rpmio/rpmuuid.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2137 -r1.2138 CHANGES
  --- rpm/CHANGES	5 Feb 2008 17:44:16 -0000	1.2137
  +++ rpm/CHANGES	6 Feb 2008 10:01:11 -0000	1.2138
  @@ -1,4 +1,5 @@
   5.0.0 -> 5.1a1:
  +    - afb: workaround for "uuid_t" type conflict, between <unistd.h> and "uuid.h"
       - jbj: fix: python: re-add rpm.archscore() for smart depsolving usage.
       - jbj: test for POPT earlier to avoid popt being blamed for neon configure failures.
       - jbj: add --with-uuid=external, --with-pcre=external to devtool "system".
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmio/rpmuuid.c
  ============================================================================
  $ cvs diff -u -r2.2 -r2.3 rpmuuid.c
  --- rpm/rpmio/rpmuuid.c	1 Feb 2008 13:52:09 -0000	2.2
  +++ rpm/rpmio/rpmuuid.c	6 Feb 2008 10:01:11 -0000	2.3
  @@ -2,6 +2,15 @@
    * \file rpmio/rpmuuid.c
    */
   
  +#if defined(__APPLE__)
  +/* workaround for "uuid_t" type conflict, between <unistd.h> and "uuid.h" */
  +#define _UUID_T
  +#define uuid_t __darwin_uuid_t
  +#include <unistd.h>
  +#undef uuid_t
  +#undef _UUID_T
  +#endif
  +
   #include "system.h"
   #include <string.h>
   #include "rpmlog.h"
  @@ .