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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=23b1127daf17ce2eaa46fba208970b2228abd3d8
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

23b1127 by Guy Harris (guy@xxxxxxxxxxxx):

    Swallow get_glib_version_info() into get_compiled_version_info().
    
    It's not that complicated, so we might as well just do it in line.
    
    Change-Id: I10809db554e668a853d28e7dca48b2de0ed51ad3
    Reviewed-on: https://code.wireshark.org/review/6190
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  93efc20   "#else", not "#elif", for the last part of a chain of conditionals.
    adds  23b1127   Swallow get_glib_version_info() into get_compiled_version_info().


Summary of changes:
 wsutil/ws_version_info.c |   27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)