diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-14 14:20:03 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-04-14 14:47:00 +0000 |
| commit | 929d8744c21a0a42705fa002d2d97bd37ef72f51 (patch) | |
| tree | b673d3d5c14c6a831c067a1c8cde5e9c26ebdf10 /community/wireshark/wireshark-0013-dirent-symbols-clash.patch | |
| parent | ab67108128cbdfca14121240807dea3bb883c5ef (diff) | |
| download | aports-929d8744c21a0a42705fa002d2d97bd37ef72f51.tar.bz2 aports-929d8744c21a0a42705fa002d2d97bd37ef72f51.tar.xz | |
community/wireshark: move from main
Diffstat (limited to 'community/wireshark/wireshark-0013-dirent-symbols-clash.patch')
| -rw-r--r-- | community/wireshark/wireshark-0013-dirent-symbols-clash.patch | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/community/wireshark/wireshark-0013-dirent-symbols-clash.patch b/community/wireshark/wireshark-0013-dirent-symbols-clash.patch new file mode 100644 index 0000000000..3bef19b9ea --- /dev/null +++ b/community/wireshark/wireshark-0013-dirent-symbols-clash.patch @@ -0,0 +1,58 @@ +diff --git a/epan/dissectors/packet-gluster.h b/epan/dissectors/packet-gluster.h +index f023f62..d0d4651 100644 +--- a/epan/dissectors/packet-gluster.h ++++ b/epan/dissectors/packet-gluster.h +@@ -356,15 +356,15 @@ enum gf_fop_procnum { + + /* dir-entry types from libglusterfs/src/compat.h */ + enum gluster_entry_types { +- DT_UNKNOWN = 0, +- DT_FIFO = 1, +- DT_CHR = 2, +- DT_DIR = 4, +- DT_BLK = 6, +- DT_REG = 8, +- DT_LNK = 10, +- DT_SOCK = 12, +- DT_WHT = 14 ++ GLUSTER_DT_UNKNOWN = 0, ++ GLUSTER_DT_FIFO = 1, ++ GLUSTER_DT_CHR = 2, ++ GLUSTER_DT_DIR = 4, ++ GLUSTER_DT_BLK = 6, ++ GLUSTER_DT_REG = 8, ++ GLUSTER_DT_LNK = 10, ++ GLUSTER_DT_SOCK = 12, ++ GLUSTER_DT_WHT = 14 + }; + + +diff --git a/epan/dissectors/packet-glusterfs.c b/epan/dissectors/packet-glusterfs.c +index 5f18258..299e783 100644 +--- a/epan/dissectors/packet-glusterfs.c ++++ b/epan/dissectors/packet-glusterfs.c +@@ -2002,15 +2002,15 @@ static value_string_ext glusterfs3_1_fop_proc_vals_ext = VALUE_STRING_EXT_INIT(g + + /* dir-entry types */ + static const value_string glusterfs_entry_type_names[] = { +- { DT_UNKNOWN, "DT_UNKNOWN" }, +- { DT_FIFO, "DT_FIFO" }, +- { DT_CHR, "DT_CHR" }, +- { DT_DIR, "DT_DIR" }, +- { DT_BLK, "DT_BLK" }, +- { DT_REG, "DT_REG" }, +- { DT_LNK, "DT_LNK" }, +- { DT_SOCK, "DT_SOCK" }, +- { DT_WHT, "DT_WHT" }, ++ { GLUSTER_DT_UNKNOWN, "DT_UNKNOWN" }, ++ { GLUSTER_DT_FIFO, "DT_FIFO" }, ++ { GLUSTER_DT_CHR, "DT_CHR" }, ++ { GLUSTER_DT_DIR, "DT_DIR" }, ++ { GLUSTER_DT_BLK, "DT_BLK" }, ++ { GLUSTER_DT_REG, "DT_REG" }, ++ { GLUSTER_DT_LNK, "DT_LNK" }, ++ { GLUSTER_DT_SOCK, "DT_SOCK" }, ++ { GLUSTER_DT_WHT, "DT_WHT" }, + { 0, NULL } + }; + static value_string_ext glusterfs_entry_type_names_ext = VALUE_STRING_EXT_INIT(glusterfs_entry_type_names); |