From bc83221d3c667b70e51dfff6ed212aada3906ee6 Mon Sep 17 00:00:00 2001 From: Parabola Date: Fri, 8 Jun 2012 19:39:34 +0000 Subject: Fri Jun 8 19:39:34 UTC 2012 --- libre/kdenetwork-kopete-libre/gcc47.patch | 59 ------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 libre/kdenetwork-kopete-libre/gcc47.patch (limited to 'libre') diff --git a/libre/kdenetwork-kopete-libre/gcc47.patch b/libre/kdenetwork-kopete-libre/gcc47.patch deleted file mode 100644 index 78af901dc..000000000 --- a/libre/kdenetwork-kopete-libre/gcc47.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- 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 - #include - #include -+#include - #endif - - #include ---- 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 -+} -+#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 --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 - 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 -+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. -- cgit v1.2.3-54-g00ecf