pidl/ws: Eliminate e_uuid_t in favor of e_guid_t

Port Wireshark commit 499d959

Author: Guy Harris <guy@alum.mit.edu>
Date:   Tue Mar 3 02:47:53 2015 -0800

    Eliminate e_uuid_t in favor of e_guid_t.

    That eliminates a redundant and confusing data type, and avoids issues
    with one piece of code using e_uuid_t but wanting to use routines
    expecting an e_guid_t.

    Change-Id: I95e172d46d342ab40f6254300ecbd2a0530cde60
    Reviewed-on: https://code.wireshark.org/review/7506
    Reviewed-by: Guy Harris <guy@alum.mit.edu>
Signed-off-by: Aurelien Aptel <aaptel@suse.com>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: David Disseldorp <ddiss@samba.org>

diff --git a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
index 547389a54c4bb68b7557354828b11e096f8b6260..573d77d5547f21dbecad893e4780aff85d35c0fe 100644 (file)
--- a/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
+++ b/pidl/lib/Parse/Pidl/Wireshark/NDR.pm
@@ -966,7 +966,7 @@ sub ProcessInterface($$)
 
                $self->pidl_def("/* Version information */\n\n");
 
-               $self->pidl_def("static e_uuid_t uuid_dcerpc_$x->{NAME} = {");
+               $self->pidl_def("static e_guid_t uuid_dcerpc_$x->{NAME} = {");
                $self->pidl_def("\t0x" . substr($if_uuid, 1, 8)
                . ", 0x" . substr($if_uuid, 10, 4)
                . ", 0x" . substr($if_uuid, 15, 4) . ",");