rpcrt4: Fix uuid_t definition which conflicts with unistd.h on Mac OS X.

Pierre d'Herbemont stegefin at free.fr
Mon Jun 5 14:46:39 CDT 2006


Hi,

This patch addresses this issue on Mac OS X:

In file included from rpc_transport.c:67:
epm_towers.h:54: error: conflicting types for 'uuid_t'
/usr/include/unistd.h:121: error: previous declaration of 'uuid_t'  
was here

Thanks,

Pierre.

ChangeLog:
Fix uuid_t definition which conflicts with unistd.h on Mac OS X.
---

  dlls/rpcrt4/epm_towers.h |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
63463e31ac0e52c4005a543d26652ca58d7ea671
diff --git a/dlls/rpcrt4/epm_towers.h b/dlls/rpcrt4/epm_towers.h
index d50d698..04502d2 100644
--- a/dlls/rpcrt4/epm_towers.h
+++ b/dlls/rpcrt4/epm_towers.h
@@ -51,13 +51,13 @@ #include <pshpack1.h>
  typedef unsigned char u_int8;
  typedef unsigned short u_int16;
  typedef unsigned int u_int32;
-typedef GUID uuid_t;
+typedef GUID rpc_uuid_t;

  typedef struct
  {
      u_int16 count_lhs;
      u_int8 protid;
-    uuid_t uuid;
+    rpc_uuid_t uuid;
      u_int16 major_version;
      u_int16 count_rhs;
      u_int16 minor_version;



More information about the wine-patches mailing list