Attachment #159593 for bug #223535

View | Details | Raw Unified | Return to bug 223535
Collapse All | Expand All

Lines 32-37 Link Here

(-)./kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc.orig (+1 lines)
32	#include "talk/base/byteorder.h"	32	#include "talk/base/byteorder.h"
33	#include "talk/base/common.h"	33	#include "talk/base/common.h"
34	#include "talk/base/logging.h"	34	#include "talk/base/logging.h"
		35	#include <cstring>
35		36
36	#if defined(_MSC_VER) && _MSC_VER < 1300	37	#if defined(_MSC_VER) && _MSC_VER < 1300
37	namespace std {	38	namespace std {

Lines 42-47 Link Here

(-)./kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc.orig (+1 lines)
42	#endif	42	#endif
43		43
44	#include <cassert>	44	#include <cassert>
		45	#include <cstring>
45		46
46	#include "talk/base/base64.h"	47	#include "talk/base/base64.h"
47	#include "talk/base/basicdefs.h"	48	#include "talk/base/basicdefs.h"

Lines 32-37 Link Here

(-)./kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.h.orig (+1 lines)
32	#include "talk/base/criticalsection.h"	32	#include "talk/base/criticalsection.h"
33	#include "talk/base/socketserver.h"	33	#include "talk/base/socketserver.h"
34	#include "talk/base/jtime.h"	34	#include "talk/base/jtime.h"
		35	#include <cstring>
35	#include <vector>	36	#include <vector>
36	#include <queue>	37	#include <queue>
37	#include <algorithm>	38	#include <algorithm>




#endif

#include <cassert>
#include <algorithm>

#ifdef POSIX
extern "C" {
#include <errno.h>
#include <fcntl.h>
#include <string.h>
#include <sys/time.h>
#include <unistd.h>
}

Lines 29-35 Link Here

(-)./kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc.orig (-1 / +2 lines)
29	#include "talk/base/logging.h"	29	#include "talk/base/logging.h"
30	#include "talk/base/network.h"	30	#include "talk/base/network.h"
31	#include "talk/base/socket.h"	31	#include "talk/base/socket.h"
32	#include <string>	32	#include <cstring>
		33	#include <cstdlib>
33	#include <iostream>	34	#include <iostream>
34	#include <cassert>	35	#include <cassert>
35	#include <errno.h>	36	#include <errno.h>

Lines 30-35 Link Here

(-)./kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc.orig (+1 lines)
30	#include "talk/base/byteorder.h"	30	#include "talk/base/byteorder.h"
31	#include <algorithm>	31	#include <algorithm>
32	#include <cassert>	32	#include <cassert>
		33	#include <cstring>
33		34
34	#if defined(_MSC_VER) && _MSC_VER < 1300	35	#if defined(_MSC_VER) && _MSC_VER < 1300
35	namespace std {	36	namespace std {

Lines 31-36 Link Here

(-)./kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpppassword.h.orig (+2 lines)
31	#include "talk/base/linked_ptr.h"	31	#include "talk/base/linked_ptr.h"
32	#include "talk/base/scoped_ptr.h"	32	#include "talk/base/scoped_ptr.h"
33		33
		34	#include <cstring>
		35
34	namespace buzz {	36	namespace buzz {
35		37
36	class XmppPasswordImpl {	38	class XmppPasswordImpl {

Lines 29-34 Link Here

(-)./kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc.orig (+1 lines)
29	#include "talk/p2p/base/stun.h"	29	#include "talk/p2p/base/stun.h"
30	#include <iostream>	30	#include <iostream>
31	#include <cassert>	31	#include <cassert>
		32	#include <cstring>
32		33
33	#if defined(_MSC_VER) && _MSC_VER < 1300	34	#if defined(_MSC_VER) && _MSC_VER < 1300
34	namespace std {	35	namespace std {

Lines 28-33 Link Here

(-)./kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc.orig (+1 lines)
28	#include "talk/base/bytebuffer.h"	28	#include "talk/base/bytebuffer.h"
29	#include "talk/p2p/base/stunserver.h"	29	#include "talk/p2p/base/stunserver.h"
30	#include <iostream>	30	#include <iostream>
		31	#include <cstring>
31		32
32	#ifdef POSIX	33	#ifdef POSIX
33	extern "C" {	34	extern "C" {

Return to bug 223535