BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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'
This commit is contained in:
Uwe Hermann 2013-04-09 18:50:34 +02:00
parent 6bad848724
commit bbe6e336b3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
output/vcd.c
View File

@ -144,7 +144,7 @@ static int init(struct sr_output *o)
return SR_OK; 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_packet *packet)
{ {
const struct sr_datafeed_logic *logic; const struct sr_datafeed_logic *logic;
@ -229,6 +229,6 @@ struct sr_output_format output_vcd = {
.description = "Value Change Dump (VCD)", .description = "Value Change Dump (VCD)",
.df_type = SR_DF_LOGIC, .df_type = SR_DF_LOGIC,
.init = init, .init = init,
.recv = recv, .recv = receive,
.cleanup = cleanup .cleanup = cleanup,
}; };