From adeb58a0d6cd87787c6275bd86254a5f4fa1de96 Mon Sep 17 00:00:00 2001
Message-Id: <adeb58a0d6cd87787c6275bd86254a5f4fa1de96.1714871481.git.mdw@distorted.org.uk>
From: Mark Wooding <mdw@chiark.greenend.org.uk>
Date: Sun, 8 Mar 2009 13:01:09 +0000
Subject: [PATCH] Build fixes for FreeBSD
Organization: Straylight/Edgeware

From: Richard Kettlewell <rjk@greenend.org.uk>

---
 clients/Makefile.am | 2 +-
 lib/uaudio-rtp.c    | 2 ++
 server/Makefile.am  | 3 ++-
 server/speaker.c    | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/clients/Makefile.am b/clients/Makefile.am
index 5456bd1..1ec55a9 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS=-I${top_srcdir}/lib -I../lib
 disorder_SOURCES=disorder.c authorize.c authorize.h \
 	../lib/memgc.c
 disorder_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-	$(LIBGC) $(LIBGCRYPT) $(LIBPCRE) $(LIBDB)
+	$(LIBGC) $(LIBGCRYPT) $(LIBPCRE) $(LIBDB) $(LIBPTHREAD)
 disorder_DEPENDENCIES=$(LIBOBJS) ../lib/libdisorder.a
 
 disorderfm_SOURCES=disorderfm.c \
diff --git a/lib/uaudio-rtp.c b/lib/uaudio-rtp.c
index 0060940..4189cb3 100644
--- a/lib/uaudio-rtp.c
+++ b/lib/uaudio-rtp.c
@@ -23,6 +23,8 @@
 #include <sys/socket.h>
 #include <ifaddrs.h>
 #include <net/if.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
 #include <gcrypt.h>
 #include <unistd.h>
 #include <time.h>
diff --git a/server/Makefile.am b/server/Makefile.am
index 7dfe99d..6062826 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -39,7 +39,8 @@ disorder_deadlock_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_speaker_SOURCES=speaker.c
 disorder_speaker_LDADD=$(LIBOBJS) ../lib/libdisorder.a \
-	$(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) $(COREAUDIO)
+	$(LIBASOUND) $(LIBPCRE) $(LIBICONV) $(LIBGCRYPT) $(COREAUDIO) \
+	$(LIBPTHREAD)
 disorder_speaker_DEPENDENCIES=../lib/libdisorder.a
 
 disorder_decode_SOURCES=decode.c disorder-server.h
diff --git a/server/speaker.c b/server/speaker.c
index 6a212dd..123f7a2 100644
--- a/server/speaker.c
+++ b/server/speaker.c
@@ -79,6 +79,7 @@
 #include <sys/un.h>
 #include <sys/stat.h>
 #include <pthread.h>
+#include <sys/resource.h>
 
 #include "configuration.h"
 #include "syscalls.h"
-- 
[mdw]