Log: Ove Kaaven <ovek@transgaming.com> Moved UUID type to rpcdce.h, as in the MS RPC headers. Removed redundant prototype. Index: include/rpc.h =================================================================== RCS file: /home/wine/wine/include/rpc.h,v retrieving revision 1.11 diff -u -r1.11 rpc.h --- include/rpc.h 13 Dec 2002 00:32:56 -0000 1.11 +++ include/rpc.h 17 Dec 2002 22:03:23 -0000 @@ -43,24 +43,6 @@ typedef void* I_RPC_HANDLE; -#ifndef GUID_DEFINED -#define GUID_DEFINED -typedef struct _GUID -{ - DWORD Data1; - WORD Data2; - WORD Data3; - BYTE Data4[8]; -} GUID; -#endif - -#ifndef UUID_DEFINED -#define UUID_DEFINED -typedef GUID UUID; -#endif - -RPC_STATUS RPC_ENTRY UuidCreate(UUID *Uuid); - #include "rpcdce.h" /* #include "rpcnsi.h" */ #include "rpcnterr.h" Index: include/rpcdce.h =================================================================== RCS file: /home/wine/wine/include/rpcdce.h,v retrieving revision 1.14 diff -u -r1.14 rpcdce.h --- include/rpcdce.h 2 Dec 2002 21:17:05 -0000 1.14 +++ include/rpcdce.h 17 Dec 2002 22:03:23 -0000 @@ -40,6 +40,11 @@ #include "guiddef.h" #endif +#ifndef UUID_DEFINED +#define UUID_DEFINED +typedef GUID UUID; +#endif + typedef void* RPC_AUTH_IDENTITY_HANDLE; typedef void* RPC_AUTHZ_HANDLE; typedef void* RPC_IF_HANDLE;