diff options
author | Márcio Silva <marcio@pc-02.localdomain> | 2012-06-08 17:13:55 -0300 |
---|---|---|
committer | Márcio Silva <marcio@pc-02.localdomain> | 2012-06-08 17:13:55 -0300 |
commit | 1b5bde5448c7eeec91c9e2b15e91f6cf26f24601 (patch) | |
tree | 801be2e4aaff9d57930b544a7a308fac63c5cc38 /libre/kdenetwork-kopete-libre/gcc47.patch | |
parent | 21c0554290cb194d7b00e645a2fbf1b28f92f758 (diff) | |
parent | 1063a1e2f30d9fa3a6373e2f73887d2dbc0b946e (diff) | |
download | abslibre-1b5bde5448c7eeec91c9e2b15e91f6cf26f24601.tar.gz abslibre-1b5bde5448c7eeec91c9e2b15e91f6cf26f24601.tar.bz2 abslibre-1b5bde5448c7eeec91c9e2b15e91f6cf26f24601.zip |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/kdenetwork-kopete-libre/gcc47.patch')
-rw-r--r-- | libre/kdenetwork-kopete-libre/gcc47.patch | 59 |
1 files changed, 0 insertions, 59 deletions
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 <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. |