diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-02-07 14:51:06 -0800 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-02-07 22:52:06 +0000 |
| commit | 3066d6b29fa872bc48176b8e4306e803a03dda8a (patch) | |
| tree | 2bb52b556967ae24282bf3e8040a40bbb48fbe74 /ui | |
| parent | 96527e24e8e10a707c51c48f52233453c3056702 (diff) | |
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>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/bluetooth_att_server_attributes_dialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/bluetooth_att_server_attributes_dialog.cpp b/ui/qt/bluetooth_att_server_attributes_dialog.cpp index c887726ed7..c21e1b7766 100644 --- a/ui/qt/bluetooth_att_server_attributes_dialog.cpp +++ b/ui/qt/bluetooth_att_server_attributes_dialog.cpp @@ -39,7 +39,7 @@ static const int column_number_uuid_name = 2; static const gchar * -bt_print_uuid(uuid_t *uuid) +bt_print_uuid(bluetooth_uuid_t *uuid) { if (uuid->bt_uuid) { return val_to_str_ext_const(uuid->bt_uuid, &bluetooth_uuid_vals_ext, "Unknown"); @@ -66,7 +66,7 @@ bt_print_uuid(uuid_t *uuid) static gchar * -bt_print_numeric_uuid(uuid_t *uuid) +bt_print_numeric_uuid(bluetooth_uuid_t *uuid) { if (uuid && uuid->size > 0) return bytes_to_str(wmem_packet_scope(), uuid->data, uuid->size); |