diff options
| author | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-05-04 16:57:56 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-05-04 16:57:56 -0300 |
| commit | 5135a4a1a795f856b6d885e641cac95db71bec34 (patch) | |
| tree | f14339a70d5d5f9db763f745909a21c9aa0503f5 /libre/kdenetwork-libre/gcc47.patch | |
| parent | 98657d1a7bfe46b99d533948bff40e6ca3fe8ff8 (diff) | |
| download | abslibre-5135a4a1a795f856b6d885e641cac95db71bec34.tar.gz abslibre-5135a4a1a795f856b6d885e641cac95db71bec34.tar.bz2 abslibre-5135a4a1a795f856b6d885e641cac95db71bec34.zip | |
kdenetwork-libre-4.8.3-2: updating version
Diffstat (limited to 'libre/kdenetwork-libre/gcc47.patch')
| -rw-r--r-- | libre/kdenetwork-libre/gcc47.patch | 59 |
1 files changed, 59 insertions, 0 deletions
diff --git a/libre/kdenetwork-libre/gcc47.patch b/libre/kdenetwork-libre/gcc47.patch new file mode 100644 index 000000000..78af901dc --- /dev/null +++ b/libre/kdenetwork-libre/gcc47.patch @@ -0,0 +1,59 @@ +--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:03:23 1292761 ++++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/socketaddress.cc 2012/05/03 16:11:00 1292762 +@@ -31,6 +31,7 @@ + #include <netinet/in.h> + #include <arpa/inet.h> + #include <netdb.h> ++#include <unistd.h> + #endif + + #include <cstring> +--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:03:23 1292761 ++++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/ssladapter.cc 2012/05/03 16:11:00 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 +--- branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:03:23 1292761 ++++ branches/KDE/4.8/kdenetwork/kopete/protocols/jabber/googletalk/libjingle/talk/base/stringutils.h 2012/05/03 16:11:00 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. |