Detect clang and llvm-gcc.

[obnox/wireshark/wip.git] / text2pcap.c

diff --git a/text2pcap.c b/text2pcap.c
index 7168730bae84d13922b92bb29f876e6190c37dd2..825fa2a12b5225a224e9fbba710fbcf60be5ecd6 100644 (file)
--- a/text2pcap.c
+++ b/text2pcap.c
@@ -125,8 +125,10 @@
 #include <errno.h>
 #include <assert.h>
 
-#ifdef NEED_GETOPT_H
-# include "getopt.h"
+#ifdef HAVE_GETOPT_H
+#include <getopt.h>
+#else
+#include "wsgetopt.h"
 #endif
 
 #ifdef NEED_STRPTIME_H
@@ -134,6 +136,7 @@
 #endif
 
 #include "text2pcap.h"
+#include "svnversion.h"
 
 /*--- Options --------------------------------------------------------------------*/
 
@@ -1028,7 +1031,7 @@ usage (void)
     fprintf(stderr,
             "Text2pcap %s"
 #ifdef SVNVERSION
-            " (" SVNVERSION ")"
+            " (" SVNVERSION " from " SVNPATH ")"
 #endif
             "\n"
             "Generate a capture file from an ASCII hexdump of packets.\n"
@@ -1326,6 +1329,7 @@ parse_options (int argc, char *argv[])
 
     ts_sec = time(0);          /* initialize to current time */
     timecode_default = *localtime(&ts_sec);
+    timecode_default.tm_isdst = -1;    /* Unknown for now, depends on time given to the strptime() function */
 
     /* Display summary of our state */
     if (!quiet) {