[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e41fd4e1ebf6c48565472c8ba514d7f0b4222b22
Submitter: Balint Reczey (balint@xxxxxxxxxxxxxxx)
Changed: branch: lts-1.8.2
Repository: wireshark

Commits:

e41fd4e by Evan Huus (eapache@xxxxxxxxx):

    Enum was used after all. Restore it and namespace it with GLUSTER_ to avoid the
    collision.
    
    svn path=/trunk/; revision=52144
    
    Conflicts:
    	epan/dissectors/packet-glusterfs.c
    
    Change-Id: Ifd032b9f06da7f71a3cafd069bae10a1779e3c75
    Reviewed-on: https://code.wireshark.org/review/3476
    Reviewed-by: Balint Reczey <balint@xxxxxxxxxxxxxxx>
    

Actions performed:

    from  2c47e49   Remove unused enum that started conflicting with /usr/include/dirent.h on my system.
    adds  e41fd4e   Enum was used after all. Restore it and namespace it with GLUSTER_ to avoid the collision.


Summary of changes:
 epan/dissectors/packet-gluster.h   |   14 ++++++++++++++
 epan/dissectors/packet-glusterfs.c |   18 +++++++++---------
 2 files changed, 23 insertions(+), 9 deletions(-)