diff options
Diffstat (limited to 'net-im/trix/files/patch-xxxprotocol.cpp')
| -rw-r--r-- | net-im/trix/files/patch-xxxprotocol.cpp | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/net-im/trix/files/patch-xxxprotocol.cpp b/net-im/trix/files/patch-xxxprotocol.cpp index 1da7cdd2d6ae..5ae9e5b6e333 100644 --- a/net-im/trix/files/patch-xxxprotocol.cpp +++ b/net-im/trix/files/patch-xxxprotocol.cpp @@ -1,37 +1,42 @@ ---- src/xxxprotocol.cpp.orig 2008-01-04 18:25:54.000000000 +0200 -+++ src/xxxprotocol.cpp 2008-04-21 01:19:07.000000000 +0300 +--- src/xxxprotocol.cpp.orig 2008-06-29 19:17:33.000000000 +0100 ++++ src/xxxprotocol.cpp 2008-07-02 13:20:41.000000000 +0100 @@ -8,6 +8,7 @@ #include <quuid.h> #include <qsocketnotifier.h> #include <qmessagebox.h> +#include <sys/param.h> - #ifdef WIN32 - #include <winsock.h> - #else -@@ -21,7 +22,7 @@ + #include <sys/types.h> + #include <sys/ioctl.h> + #include <sys/socket.h> +@@ -17,12 +18,11 @@ + #include <unistd.h> #include <fcntl.h> - #endif -#ifdef FREEBSD +#ifdef BSD #include <err.h> #include <errno.h> #include <net/if.h> -@@ -223,7 +224,7 @@ + #include <sys/sysctl.h> +-#include <sys/param.h> + #include <netinet/if_ether.h> + #include <net/route.h> + #include <net/if_dl.h> +@@ -207,7 +207,7 @@ QString XXXProtocol::getHWAddr(const QString& addr, const QString& iface) { QString macaddr(tr("Unknown")); --#if defined( FREEBSD ) -+#if defined( BSD ) +-#ifdef BSD ++#if defined ( BSD ) struct sockaddr_inarp addr_inarp; bzero(&addr_inarp, sizeof(addr_inarp)); -@@ -265,7 +266,7 @@ +@@ -249,7 +249,7 @@ return macaddr; } --#if defined( FREEBSD ) -+#if defined( BSD ) +-#ifdef BSD ++#if defined ( BSD ) struct sockaddr_dl * XXXProtocol::search(u_long addr) { int mib[6]; |