diff options
| author | Max Brazhnikov <makc@FreeBSD.org> | 2012-05-25 02:15:20 +0000 |
|---|---|---|
| committer | Max Brazhnikov <makc@FreeBSD.org> | 2012-05-25 02:15:20 +0000 |
| commit | f564508406256a7dc7e7f9589788c00e917c1863 (patch) | |
| tree | b6ce65710c94504aa252a65ee74453340de3d60c /net/kdenetwork4/files/patch-svn_1292762.diff | |
| parent | 4319d238082bcfa3ccbb9d4f572c65c0547d8269 (diff) | |
| download | ports-f564508406256a7dc7e7f9589788c00e917c1863.tar.gz ports-f564508406256a7dc7e7f9589788c00e917c1863.zip | |
Notes
Diffstat (limited to 'net/kdenetwork4/files/patch-svn_1292762.diff')
| -rw-r--r-- | net/kdenetwork4/files/patch-svn_1292762.diff | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/net/kdenetwork4/files/patch-svn_1292762.diff b/net/kdenetwork4/files/patch-svn_1292762.diff new file mode 100644 index 000000000000..81071b21da48 --- /dev/null +++ b/net/kdenetwork4/files/patch-svn_1292762.diff @@ -0,0 +1,65 @@ +Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc +=================================================================== +--- kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc (revision 1292761) ++++ kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc (revision 1292762) +@@ -31,6 +31,7 @@ + #include <netinet/in.h> + #include <arpa/inet.h> + #include <netdb.h> ++#include <unistd.h> + #endif + + #include <cstring> +Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc +=================================================================== +--- kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc (revision 1292761) ++++ kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc (revision 1292762) +@@ -27,6 +27,12 @@ + + #include "talk/base/ssladapter.h" + ++#ifdef POSIX ++extern "C" { ++#include <unistd.h> ++} ++#endif ++ + #if !defined(SSL_USE_SCHANNEL) && !defined(SSL_USE_OPENSSL) + #ifdef WIN32 + #define SSL_USE_SCHANNEL 1 +Index: kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h +=================================================================== +--- kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h (revision 1292761) ++++ kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h (revision 1292762) +@@ -198,15 +198,6 @@ + } + + template<class CTYPE> +-size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) { +- va_list args; +- va_start(args, format); +- size_t len = vsprintfn(buffer, buflen, format, args); +- va_end(args); +- return len; +-} +- +-template<class CTYPE> + size_t vsprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, + va_list args) { + int len = vsnprintf(buffer, buflen, format, args); +@@ -217,6 +208,15 @@ + return len; + } + ++template<class CTYPE> ++size_t sprintfn(CTYPE* buffer, size_t buflen, const CTYPE* format, ...) { ++ va_list args; ++ va_start(args, format); ++ size_t len = vsprintfn(buffer, buflen, format, args); ++ va_end(args); ++ return len; ++} ++ + /////////////////////////////////////////////////////////////////////////////// + // Allow safe comparing and copying ascii (not UTF-8) with both wide and + // non-wide character strings. |