From: Uwe Hermann <redacted>
Date: Tue, 28 Jan 2014 14:55:24 +0000 (+0100)
Subject: Fix more warnings when building without libsigrokdecode.
X-Git-Tag: sigrok-cli-0.5.0~43
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=55de58a2b9ea6673d30e7250b60fa36953e0447a;p=sigrok-cli.git

Fix more warnings when building without libsigrokdecode.
---

diff --git a/device.c b/device.c
index a7dfe62..cfd4566 100644
--- a/device.c
+++ b/device.c
@@ -20,6 +20,7 @@
 #include "sigrok-cli.h"
 #include "config.h"
 #include <glib.h>
+#include <string.h>
 
 extern struct sr_context *sr_ctx;
 extern gchar *opt_drv;
diff --git a/session.c b/session.c
index 82efee0..9441f5d 100644
--- a/session.c
+++ b/session.c
@@ -21,6 +21,8 @@
 #include "config.h"
 #include <glib.h>
 #include <glib/gstdio.h>
+#include <string.h>
+#include <stdlib.h>
 
 static struct sr_output_format *output_format = NULL;
 static int default_output_format = FALSE;
@@ -173,7 +175,10 @@ void datafeed_in(const struct sr_dev_inst *sdi,
 	GSList *l;
 	GString *out;
 	int sample_size, ret;
-	uint64_t samplerate, output_len, filter_out_len, end_sample;
+	uint64_t samplerate, output_len, filter_out_len;
+#ifdef HAVE_SRD
+	uint64_t end_sample;
+#endif
 	uint8_t *output_buf, *filter_out;
 
 	(void) cb_data;
diff --git a/show.c b/show.c
index e1a5bad..ee14037 100644
--- a/show.c
+++ b/show.c
@@ -20,6 +20,7 @@
 #include "sigrok-cli.h"
 #include "config.h"
 #include <glib.h>
+#include <string.h>
 
 extern gint opt_loglevel;
 extern gchar *opt_pds;