From: Mike Brady <4265913+mikebrady@users.noreply.github.com>
Date: Thu, 9 Dec 2021 14:16:37 +0000 (+0000)
Subject: Merge "openbsd corrections #1357" after resolving one conflict.
X-Git-Tag: 4.1-rc1~24^2~357^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5aa3324d3d88d42698e116de4d418b5103fe61b8;p=thirdparty%2Fshairport-sync.git

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

5aa3324d3d88d42698e116de4d418b5103fe61b8
diff --cc common.c
index bbe36780,feec44ad..d5ce6a5a
--- a/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