diff options
| -rw-r--r-- | wiretap/file_access.c | 2 | ||||
| -rw-r--r-- | wiretap/merge.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index a308c11e0c..69604e2371 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -1120,9 +1120,11 @@ success: if (wth->file_type_subtype == WTAP_FILE_TYPE_SUBTYPE_PCAP_NSEC) { descr.time_units_per_second = 1000000000; /* nanosecond resolution */ descr.if_tsresol = 9; + descr.tsprecision = WTAP_TSPREC_NSEC; } else { descr.time_units_per_second = 1000000; /* default microsecond resolution */ descr.if_tsresol = 6; + descr.tsprecision = WTAP_TSPREC_USEC; } descr.link_type = wtap_wtap_encap_to_pcap_encap(wth->file_encap); descr.snap_len = wth->snapshot_length; diff --git a/wiretap/merge.c b/wiretap/merge.c index fce8f9783e..9dbaf9231c 100644 --- a/wiretap/merge.c +++ b/wiretap/merge.c @@ -40,7 +40,7 @@ #include "wsutil/os_version_info.h" -#if 1 +#if 0 #define merge_debug0(str) g_warning(str) #define merge_debug1(str,p1) g_warning(str,p1) #define merge_debug2(str,p1,p2) g_warning(str,p1,p2) |