From: Uwe Hermann <redacted>
Date: Tue, 9 Apr 2013 16:50:34 +0000 (+0200)
Subject: vcd output: Build fix for Windows/MinGW.
X-Git-Tag: dsupstream~221
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=bbe6e336b3baf86b43f88185f25eab424cbd61f6;p=libsigrok.git

vcd output: Build fix for Windows/MinGW.

On Windows/MinGW 'recv' seems to be already defined in windows.h/winsock2.h.

Use 'receive' instead, for now, otherwise we get an error:

vcd.c:147:17: error: conflicting types for 'recv'
---

diff --git a/output/vcd.c b/output/vcd.c
index e1661e5c..98159e9f 100644
--- a/output/vcd.c
+++ b/output/vcd.c
@@ -144,7 +144,7 @@ static int init(struct sr_output *o)
 	return SR_OK;
 }
 
-static GString *recv(struct sr_output *o, const struct sr_dev_inst *sdi,
+static GString *receive(struct sr_output *o, const struct sr_dev_inst *sdi,
 		const struct sr_datafeed_packet *packet)
 {
 	const struct sr_datafeed_logic *logic;
@@ -229,6 +229,6 @@ struct sr_output_format output_vcd = {
 	.description = "Value Change Dump (VCD)",
 	.df_type = SR_DF_LOGIC,
 	.init = init,
-	.recv = recv,
-	.cleanup = cleanup
+	.recv = receive,
+	.cleanup = cleanup,
 };