Merge pull request #377 from msekletar/master

timestamps: make possible to request high precision timestamps

diff --cc tcpdump.c
index f41bf697bf90cc6757750766d51c4840d7150b43,95b5ac0a10849da2ff898dabc46026ad374a76cd..d9f3e0fa96761fa993b0360fca4c53585c254d90
--- 1/tcpdump.c
--- 2/tcpdump.c
+++ b/tcpdump.c
@@@ -650,8 -650,9 +650,9 @@@ show_devices_and_exit (void
   */
  #define OPTION_NUMBER 128
  #define OPTION_VERSION        129
+ #define OPTION_TSTAMP_PRECISION 130
  
 -static struct option longopts[] = {
 +static const struct option longopts[] = {
  #if defined(HAVE_PCAP_CREATE) || defined(WIN32)
        { "buffer-size", required_argument, NULL, 'B' },
  #endif

diff --cc util.c
Simple merge