diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2020-05-02 10:36:31 -0500 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-05-04 07:15:53 +0000 |
| commit | df5b18f437ee60d51c8e7d3ccd3c8db0dfdd75f0 (patch) | |
| tree | 59d529eb08293a230e0f984a03631ed07ee0d000 | |
| parent | f3ddcb96a369472cde3c83f26ff747d5772b8e3a (diff) | |
RTPS: avoid warning from Conflict Check
Change-Id: I1c22a822e7b2729af801b1ebdde43527018b922b
Reviewed-on: https://code.wireshark.org/review/37026
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
| -rw-r--r-- | epan/dissectors/packet-rtps.c | 1 | ||||
| -rw-r--r-- | epan/dissectors/packet-rtps.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/epan/dissectors/packet-rtps.c b/epan/dissectors/packet-rtps.c index 50b86200bb..0322c3f24c 100644 --- a/epan/dissectors/packet-rtps.c +++ b/epan/dissectors/packet-rtps.c @@ -959,7 +959,6 @@ static const value_string parameter_id_v2_vals[] = { { PID_TYPE_CHECKSUM, "PID_TYPE_CHECKSUM [deprecated]" }, { PID_TYPE2_NAME, "PID_TYPE2_NAME [deprecated]" }, { PID_TYPE2_CHECKSUM, "PID_TYPE2_CHECKSUM [deprecated]" }, - { PID_IS_RELIABLE, "PID_IS_RELIABLE [deprecated]" }, { PID_EXPECTS_ACK, "PID_EXPECTS_ACK [deprecated]" }, { PID_MANAGER_KEY, "PID_MANAGER_KEY [deprecated]" }, { PID_SEND_QUEUE_SIZE, "PID_SEND_QUEUE_SIZE [deprecated]" }, diff --git a/epan/dissectors/packet-rtps.h b/epan/dissectors/packet-rtps.h index 04a3e524c9..7a3c55b68d 100644 --- a/epan/dissectors/packet-rtps.h +++ b/epan/dissectors/packet-rtps.h @@ -211,7 +211,6 @@ typedef struct _rtps_dissector_data { #define PID_TYPE_CHECKSUM (0x08) #define PID_TYPE2_NAME (0x09) #define PID_TYPE2_CHECKSUM (0x0a) -#define PID_IS_RELIABLE (0x0f) #define PID_EXPECTS_ACK (0x10) #define PID_MANAGER_KEY (0x12) #define PID_SEND_QUEUE_SIZE (0x13) |