From 523444b7b69fd14798a70cbf98b4f5f0177bfd2a Mon Sep 17 00:00:00 2001 From: Jim McDonough Date: Thu, 30 Oct 2003 16:38:39 +0000 Subject: First round of merging various UUID structures. This eliminates RPC_UUID. It creates the following struct: struct uuid { uint32 time_low; uint16 time_mid; uint16 time_hi_and_version; uint8 clock_seq[2]; uint8 node[6]; }; which replaces RPC_UUID and various random struct uuid definitions and a flat version: #define UUID_FLAT_SIZE 16 typedef struct uuid_flat { uint8 info[UUID_FLAT_SIZE]; } UUID_FLAT; which pretty much looks like GUID (which I will start eliminating). I want us to use the FLAT one only on the wire (perhaps in files, too?), and I want it to be obvious to the coder that it is the FLAT version. This leaves a couple of compiler warnings, where GUID isn't completely replaced by FLAT_UUID yet...I'll get to those soon. (This used to be commit 1532b5d2e3c61df232b16394acedf6eac387588b) --- source3/include/rpc_epmapper.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/include/rpc_epmapper.h') diff --git a/source3/include/rpc_epmapper.h b/source3/include/rpc_epmapper.h index de3a2cb08d..bbca6ac1f2 100644 --- a/source3/include/rpc_epmapper.h +++ b/source3/include/rpc_epmapper.h @@ -51,7 +51,7 @@ typedef struct uint16 length; uint8 protocol; struct { - RPC_UUID uuid; + struct uuid uuid; uint16 version; } uuid; } lhs; -- cgit