[ovs-dev] [PATCH 3/4] ofproto: Fix duplicate wait function from OSX

Thomas Graf tgraf at noironetworks.com
Fri Jan 23 11:38:56 UTC 2015


On 01/23/15 at 01:17am, Dave Tucker wrote:
> Signed-off-by: Dave Tucker <dave at 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 ;-)

I think you have to rename the wait() function in ofproto-dpif.c to
something unique instead.



More information about the dev mailing list