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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2d0b46d0a5f67044c980fef26be86080dc045fcc
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

2d0b46d by Alexis La Goutte (alexis.lagoutte@xxxxxxxxx):

    ERF: fix no previous prototype for 'erf_ts_to_nstime/dissect_relative_time/dissect_ptp_timeinterval' [-Wmissing-prototypes]
    
    Change-Id: I21ee4f8850f63de3a7fa91ed9e8a426c82a9d62e
    Reviewed-on: https://code.wireshark.org/review/17143
    Reviewed-by: Michael Mann <mmann78@xxxxxxxxxxxx>
    (cherry picked from commit 26464b028baac61102fea77b7ae6f19755c2359e)
    Reviewed-on: https://code.wireshark.org/review/17241
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  c97041c   packet-erf.c: Pacify OS X buildbot.
    adds  2d0b46d   ERF: fix no previous prototype for 'erf_ts_to_nstime/dissect_relative_time/dissect_ptp_timeinterval' [-Wmissing-prototypes]


Summary of changes:
 epan/dissectors/packet-erf.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)