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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=a9e19bc3917806f5293dd1bbbbf8f4f22b5fe50c
Submitter: Peter Wu (peter@xxxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

a9e19bc by Guy Harris (guy@xxxxxxxxxxxx):

    Avoid colliding with the (old) UNIX stime() system call.
    
    Rename "stime" to "sys_time", and, for consistency, do the same with
    "utime".  This failed when I tried a build on an Ubuntu 12.04 LTS
    machine.
    
    Change-Id: Ib955b723506346aa742db0de4d26dc157bcd4fc8
    Reviewed-on: https://code.wireshark.org/review/16935
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 66711eb2612ddc7f523b7cc5990e1674a755cb00)
    Reviewed-on: https://code.wireshark.org/review/17389
    Reviewed-by: Peter Wu <peter@xxxxxxxxxxxxx>
    

Actions performed:

    from  5f59439   Use correct relative path.
    adds  a9e19bc   Avoid colliding with the (old) UNIX stime() system call.


Summary of changes:
 wsutil/time_util.c |   29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)