On 23 Jan 2015, at 11:38, Thomas Graf wrote:
On 01/23/15 at 01:17am, Dave Tucker wrote:
Signed-off-by: Dave Tucker <d...@dtucker.co.uk>
---
ofproto/ofproto-dpif.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
index bf15d04..a922544 100644
--- a/ofproto/ofproto-dpif.c
+++ b/ofproto/ofproto-dpif.c
@@ -1591,6 +1591,8 @@ run(struct ofproto *ofproto_)
return 0;
}
+// There is an issue with Darwin aliasing wait from sys/wait.h
+#ifndef __APPLE__
static void
wait(struct ofproto *ofproto_)
{
@@ -1630,6 +1632,7 @@ wait(struct ofproto *ofproto_)
seq_wait(udpif_dump_seq(ofproto->backer->udpif),
ofproto->dump_seq);
seq_wait(ofproto->pins_seq, ofproto->pins_seqno);
}
+#endif
I doubt that the Darwin implementation takes a struct ofproto ;-)
Yeah I brute-forced a way around it that only generates some compile
time warnings :)
I think you have to rename the wait() function in ofproto-dpif.c to
something unique instead.
Sure. How does `ovs-wait` sound?
I'm assuming this will need renaming in *every* source file though
unless we can do some ifdef magic.
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
