summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdwin Groothuis <wireshark@mavetju.org>2014-02-02 11:05:30 +1100
committerEvan Huus <eapache@gmail.com>2014-02-02 00:18:59 +0000
commit05f54f7d6a18d50e1f59e6f63abe6e55ce53c156 (patch)
treedd1be9b7e907468c63d28c0ae705178d87dedfda
parentec6fc7690ba9930798a50f1c4e1e6173e715742b (diff)
downloadwireshark-05f54f7d6a18d50e1f59e6f63abe6e55ce53c156.tar.gz
Fix build on FreeBSD 10.0
Change-Id: I6be0d2dfe3b44f166233b1dd20ef02c10a024f97 Reviewed-on: https://code.wireshark.org/review/74 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
-rwxr-xr-xtools/runlex.sh2
-rw-r--r--wiretap/ascend.y3
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/runlex.sh b/tools/runlex.sh
index 51ac2717fa..5860318cbe 100755
--- a/tools/runlex.sh
+++ b/tools/runlex.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/sh
#
# runlex.sh
diff --git a/wiretap/ascend.y b/wiretap/ascend.y
index c6c5b4b6a0..2ad134ccef 100644
--- a/wiretap/ascend.y
+++ b/wiretap/ascend.y
@@ -148,7 +148,8 @@ void yyerror(FILE_T fh _U_, const char *);
const gchar *ascend_parse_error;
static unsigned int bcur;
-static guint32 start_time, secs, usecs, caplen, wirelen;
+static guint32 start_time, usecs, caplen, wirelen;
+static time_t secs;
struct ascend_phdr *pseudo_header;
static guint8 *pkt_data;
static gint64 first_hexbyte;