cd1ee1d986
they are installed and should work without the pkgsrc framework to define e.g. LIBTOOL. Bump the revision for this. Fix the inclusion in Makefiles by crudely faking the installation directory layout. Remove some explicit casts which break with GCC 3.4 and OpenSSL 0.9.8, this might need to be conditionalized. Add DraogonFly support and somewhat cleanup the FreeBSD sound includes.
50 lines
2.3 KiB
Text
50 lines
2.3 KiB
Text
$NetBSD: patch-bb,v 1.3 2006/01/08 04:57:55 joerg Exp $
|
|
|
|
--- src/ptlib/unix/socket.cxx.orig 2004-08-24 09:08:11.000000000 +0200
|
|
+++ src/ptlib/unix/socket.cxx 2004-10-09 13:40:31.000000000 +0200
|
|
@@ -331,7 +331,7 @@
|
|
#define ifr_macaddr ifr_hwaddr.sa_data
|
|
#endif
|
|
|
|
-#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_SOLARIS) || defined(P_MACOSX) || defined(P_MACOS) || defined(P_IRIX) || defined(P_VXWORKS) || defined(P_RTEMS) || defined(P_QNX)
|
|
+#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_SOLARIS) || defined(P_MACOSX) || defined(P_MACOS) || defined(P_IRIX) || defined(P_VXWORKS) || defined(P_RTEMS) || defined(P_QNX) || defined(P_DRAGONFLY)
|
|
#define ifr_netmask ifr_addr
|
|
|
|
#include <net/if_dl.h>
|
|
@@ -348,7 +348,8 @@
|
|
|
|
#endif
|
|
|
|
-#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_MACOS) || defined(P_QNX)
|
|
+#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_MACOS) || defined(P_QNX) || defined(P_DRAGONFLY)
|
|
+#include <sys/param.h>
|
|
#include <sys/sysctl.h>
|
|
#endif
|
|
|
|
@@ -762,7 +763,7 @@ BOOL PTCPSocket::Read(void * buf, PINDEX
|
|
}
|
|
|
|
|
|
-#if P_HAS_RECVMSG
|
|
+#if P_HAS_RECVMSG && P_HAS_PKTINFO
|
|
|
|
int PSocket::os_recvfrom(
|
|
void * buf, // Data to be written as URGENT TCP data.
|
|
@@ -1268,7 +1269,7 @@ BOOL PIPSocket::GetRouteTable(RouteTable
|
|
}
|
|
}
|
|
|
|
-#elif defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_QNX)
|
|
+#elif defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_QNX) || defined(P_DRAGONFLY)
|
|
|
|
BOOL process_rtentry(struct rt_msghdr *rtm, char *ptr, unsigned long *p_net_addr,
|
|
unsigned long *p_net_mask, unsigned long *p_dest_addr, int *p_metric);
|
|
@@ -1806,7 +1807,7 @@ BOOL PIPSocket::GetInterfaceTable(Interf
|
|
}
|
|
}
|
|
|
|
-#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_VXWORKS) || defined(P_RTEMS) || defined(P_QNX)
|
|
+#if defined(P_FREEBSD) || defined(P_OPENBSD) || defined(P_NETBSD) || defined(P_MACOSX) || defined(P_VXWORKS) || defined(P_RTEMS) || defined(P_QNX) || defined(P_DRAGONFLY)
|
|
// Define _SIZEOF_IFREQ for platforms (eg OpenBSD) which do not have it.
|
|
#ifndef _SIZEOF_ADDR_IFREQ
|
|
#define _SIZEOF_ADDR_IFREQ(ifr) \
|