Wireshark-commits: [Wireshark-commits] master-2.2 7968175: time_util: fix -Wshadow issue

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Tue, 30 Aug 2016 13:31:19 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=7968175e72278a34a6997321c5a25e7d32b3b823
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

7968175 by Peter Wu (peter@xxxxxxxxxxxxx):

    time_util: fix -Wshadow issue
    
    time_util.c was already fixed, but the header was missing the change,
    breaking the build on a very old compiler.
    
    Change-Id: I95685c9a3e25dcb7567f2551b92f20c8792a6e47
    Reviewed-on: https://code.wireshark.org/review/17384
    Petri-Dish: Dario Lombardo <lomato@xxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Dario Lombardo <lomato@xxxxxxxxx>
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    (cherry picked from commit a892c90367a9f1b1d3d962cfe958174b8fefcaee)
    Reviewed-on: https://code.wireshark.org/review/17390
    

Actions performed:

    from  a9e19bc   Avoid colliding with the (old) UNIX stime() system call.
    adds  7968175   time_util: fix -Wshadow issue


Summary of changes:
 wsutil/time_util.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)