Merge "openbsd corrections #1357" after resolving one conflict.

diff --cc common.c
index bbe36780370ea78fb36e7799888c6037edb74fe3,feec44ad5af2eed2d94f73765410106c59d9529e..d5ce6a5ac310b0dba20805a60e35ecc666feb31a
--- 1/common.c
--- 2/common.c
+++ b/common.c
@@@ -54,10 -55,10 +55,10 @@@
  #include <netpacket/packet.h>
  #endif
  
- #ifdef COMPILE_FOR_FREEBSD
+ #ifdef COMPILE_FOR_BSD
 -#include <netinet/in.h>
 -#include <net/if_types.h>
  #include <net/if_dl.h>
 +#include <net/if_types.h>
 +#include <netinet/in.h>
  #endif
  
  #ifdef COMPILE_FOR_OSX

diff --cc configure.ac
Simple merge

diff --cc shairport.c
Simple merge