]> sigrok.org Git - libsigrok.git/commitdiff
vcd output: Build fix for Windows/MinGW.
authorUwe Hermann <redacted>
Tue, 9 Apr 2013 16:50:34 +0000 (18:50 +0200)
committerUwe Hermann <redacted>
Tue, 9 Apr 2013 16:57:20 +0000 (18:57 +0200)
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'

output/vcd.c

index e1661e5c08cfc7367eecfd63315638f4f9fe9d32..98159e9f59a84fd3bf32a69910be1b9a18eba14f 100644 (file)
@@ -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,
 };