Fix build errors on -current.

6 files changed, 109 insertions, 0 deletions

diff --git a/net/priss/files/patch-ac b/net/priss/files/patch-ac
new file mode 100644
index 000000000000..67e63dd53c03
--- /dev/null
+++ b/net/priss/files/patch-ac
@@ -0,0 +1,11 @@
+--- QTFile/QTTrack.h.orig	Sun Feb 27 09:42:11 2000
++++ QTFile/QTTrack.h	Sun Feb 27 09:42:31 2000
+@@ -84,7 +84,7 @@
+ 	// Accessors.
+ 	inline	bool		IsInitialized(void) { return fIsInitialized; }
+ 	
+-	inline	char *		GetTrackName(void) { return (fTrackName ? fTrackName : ""); }
++	inline	char *		GetTrackName(void) { return (fTrackName ? fTrackName : (char *)""); }
+ 	inline	UInt32		GetTrackID(void) { return fTrackHeaderAtom->GetTrackID(); }
+ 	inline	UInt32		GetCreationTime(void) { return fTrackHeaderAtom->GetCreationTime(); }
+ 	inline	UInt32		GetModificationTime(void) { return fTrackHeaderAtom->GetModificationTime(); }
diff --git a/net/priss/files/patch-ad b/net/priss/files/patch-ad
new file mode 100644
index 000000000000..5e6eef95201b
--- /dev/null
+++ b/net/priss/files/patch-ad
@@ -0,0 +1,10 @@
+--- RhapServer/OSMutex.h.orig	Sun Feb 27 09:45:03 2000
++++ RhapServer/OSMutex.h	Sun Feb 27 09:45:12 2000
+@@ -44,6 +44,7 @@
+ #include "mymutex.h"
+ #else
+ #include <pthread.h>
++#include <pthread_np.h>
+ #endif
+ 
+ #include "OSHeaders.h"
diff --git a/net/priss/files/patch-ae b/net/priss/files/patch-ae
new file mode 100644
index 000000000000..4c5d9334a5a3
--- /dev/null
+++ b/net/priss/files/patch-ae
@@ -0,0 +1,11 @@
+--- RhapServer/RTSPRequestInterface.cpp.orig	Sun Feb 27 09:47:18 2000
++++ RhapServer/RTSPRequestInterface.cpp	Sun Feb 27 09:47:38 2000
+@@ -501,7 +501,7 @@
+ 					GetUsersMovieFolderPath(0, &len);
+ 		if (len)
+ 		{
+-			char*	home = malloc(1024);
++			char*	home = (char *)malloc(1024);
+ 			if (FindUsersHome(user, home))
+ 			{
+ 				strcat(home, movieDirPath);
diff --git a/net/priss/files/patch-af b/net/priss/files/patch-af
new file mode 100644
index 000000000000..3c6e3e1d1bec
--- /dev/null
+++ b/net/priss/files/patch-af
@@ -0,0 +1,26 @@
+--- RhapServer/TCPListenerSocket.cpp.orig	Sun Feb 27 09:49:27 2000
++++ RhapServer/TCPListenerSocket.cpp	Sun Feb 27 10:01:25 2000
+@@ -42,6 +42,10 @@
+ #include <sys/errno.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
++
+ #include "TCPListenerSocket.h"
+ #include "Task.h"
+ 
+@@ -82,7 +86,12 @@
+ 	//fSocket data member of TCPSocket.
+ 	while (true)
+ 	{
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 400013)
++		int osSocket = accept(fSocket, (struct sockaddr*)&addr,
++		    (socklen_t*)&size);
++#else
+ 		int osSocket = accept(fSocket, (struct sockaddr*)&addr, &size);
++#endif
+ 		if (osSocket == -1)
+ 		{
+ 			//take a look at what this error is.
diff --git a/net/priss/files/patch-ag b/net/priss/files/patch-ag
new file mode 100644
index 000000000000..fc41eb11e24b
--- /dev/null
+++ b/net/priss/files/patch-ag
@@ -0,0 +1,26 @@
+--- RhapServer/TCPSocket.cpp.orig	Sun Feb 27 09:54:42 2000
++++ RhapServer/TCPSocket.cpp	Sun Feb 27 09:59:32 2000
+@@ -41,6 +41,10 @@
+ #include <sys/errno.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
++
+ #include "TCPSocket.h"
+ #include "SocketUtils.h"
+ #include "OS.h"
+@@ -57,7 +61,12 @@
+ 	//make sure to find out what IP address this connection is actually occuring on. That
+ 	//way, we can report correct information to clients asking what the connection's IP is
+ 	int len = sizeof(fLocalAddr);
++#if defined(__FreeBSD_version) && (__FreeBSD_version >= 400013)
++	int err = ::getsockname(fSocket, (struct sockaddr*)&fLocalAddr,
++	    (socklen_t*)&len);
++#else
+ 	int err = ::getsockname(fSocket, (struct sockaddr*)&fLocalAddr, &len);
++#endif
+ 	AssertV(err == 0, OSThread::GetErrno());
+ 	
+ 	fState |= kBound;
diff --git a/net/priss/files/patch-ah b/net/priss/files/patch-ah
new file mode 100644
index 000000000000..ad1a53796b4e
--- /dev/null
+++ b/net/priss/files/patch-ah
@@ -0,0 +1,25 @@
+--- RhapServer/UDPSocket.cpp.orig	Sun Feb 27 10:02:16 2000
++++ RhapServer/UDPSocket.cpp	Sun Feb 27 10:03:48 2000
+@@ -39,6 +39,10 @@
+ #include <sys/errno.h>
+ #endif
+ 
++#ifdef __FreeBSD__
++#include <sys/param.h>
++#endif
++
+ #if NEED_SOCKETBITS
+ #include <socketbits.h>
+ #endif
+@@ -141,7 +145,11 @@
+ 	
+ 	int addrLen = sizeof(fMsgAddr);
+ 	
++#if defined(__FreeBSD__) && (__FreeBSD_version >= 400013)
++	SInt32 theRecvLen = ::recvfrom(fSocket, ioBuffer, inBufLen, 0, (sockaddr*)&fMsgAddr, (socklen_t*)&addrLen);
++#else
+ 	SInt32 theRecvLen = ::recvfrom(fSocket, ioBuffer, inBufLen, 0, (sockaddr*)&fMsgAddr, &addrLen);
++#endif
+ 	if (theRecvLen == -1)
+ 		return this-> CheckError(outRecvLen);
+