Don't call the Bluetooth code's UUID type "uuid_t".

uuid_t is a data type provided by a number of environments, thanks to
the Open Software Fuundation; calling the Bluetooth code's data type,
which includes an actual OSF-style UUID as a member, "uuid_t" can lead
to confusion and *does* lead to compile errors on platforms where, for
better or worse, system headers such as <unistd.h> define uuid_t (and
are included by, for example, Qt headers).

Just rename it "bluetooth_uuid_t".

Change-Id: Ic742723913ba4105cd3269dd24fc821147285176
Reviewed-on: https://code.wireshark.org/review/7017
Reviewed-by: Guy Harris <guy@alum.mit.edu>

1 files changed, 4 insertions, 4 deletions

diff --git a/epan/dissectors/packet-bluetooth.h b/epan/dissectors/packet-bluetooth.h
index 18e69e5493..876ab20ffe 100644
--- a/epan/dissectors/packet-bluetooth.h
+++ b/epan/dissectors/packet-bluetooth.h
@@ -205,7 +205,7 @@ typedef struct _uuid_t {
     guint16  bt_uuid;
     guint8   size;
     guint8   data[16];
-} uuid_t;
+} bluetooth_uuid_t;
 
 typedef struct _bluetooth_uuid_custom {
     const guint8  uuid[16];
@@ -223,9 +223,9 @@ extern guint32           max_disconnect_in_frame;
 extern gint dissect_bd_addr(gint hf_bd_addr, proto_tree *tree, tvbuff_t *tvb,
         gint offset, guint8 *bdaddr);
 
-extern uuid_t  get_uuid(tvbuff_t *tvb, gint offset, gint size);
-extern gchar  *print_uuid(uuid_t *uuid);
-extern gchar  *print_numeric_uuid(uuid_t *uuid);
+extern bluetooth_uuid_t  get_uuid(tvbuff_t *tvb, gint offset, gint size);
+extern gchar  *print_uuid(bluetooth_uuid_t *uuid);
+extern gchar  *print_numeric_uuid(bluetooth_uuid_t *uuid);
 
 extern void save_local_device_name_from_eir_ad(tvbuff_t *tvb, gint offset,
         packet_info *pinfo, guint8 size, bluetooth_data_t *bluetooth_data);