[Pkg-telepathy-commits] [SCM] libjingle0.3 packaging branch, debian-lenny-patches, updated. 9ebee35c7f7cff456c26f6b0fa98f93f4e9d0afc

Simon McVittie smcv at debian.org
Fri Dec 26 23:35:33 UTC 2008 

The following commit has been merged in the debian-lenny-patches branch:
commit 3a2a28843daf15a05729abc3d92d9dfe67ea6c96
Author: Simon McVittie <smcv at debian.org>
Date:   Fri Dec 26 22:35:51 2008 +0000

    Patch by Hubert Figuiere to fix compilation problems with GCC 4.3 (Debian #455146)

diff --git a/talk/base/asynctcpsocket.cc b/talk/base/asynctcpsocket.cc
index 6d4697a..8bf66a3 100644
--- a/talk/base/asynctcpsocket.cc
+++ b/talk/base/asynctcpsocket.cc
@@ -32,6 +32,7 @@
 #include "talk/base/byteorder.h"
 #include "talk/base/common.h"
 #include "talk/base/logging.h"
+#include <cstring>
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
 namespace std {
diff --git a/talk/base/bytebuffer.cc b/talk/base/bytebuffer.cc
index c888ac3..6c89c02 100644
--- a/talk/base/bytebuffer.cc
+++ b/talk/base/bytebuffer.cc
@@ -28,6 +28,7 @@
 #include "talk/base/basictypes.h"
 #include "talk/base/bytebuffer.h"
 #include "talk/base/byteorder.h"
+#include <string.h>
 #include <algorithm>
 #include <cassert>
 
diff --git a/talk/base/host.cc b/talk/base/host.cc
index 7b7490d..5748312 100644
--- a/talk/base/host.cc
+++ b/talk/base/host.cc
@@ -32,6 +32,7 @@
 #include <string>
 #include <iostream>
 #include <cassert>
+#include <cstdlib>
 #include <errno.h>
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
diff --git a/talk/base/logging.cc b/talk/base/logging.cc
index b06ed64..c8c025c 100644
--- a/talk/base/logging.cc
+++ b/talk/base/logging.cc
@@ -33,6 +33,7 @@
 
 #include <iostream>
 #include <iomanip>
+#include <cstring>
 
 #include "talk/base/logging.h"
 #include "talk/base/stream.h"
diff --git a/talk/base/messagequeue.h b/talk/base/messagequeue.h
index 232d338..892ba3d 100644
--- a/talk/base/messagequeue.h
+++ b/talk/base/messagequeue.h
@@ -32,6 +32,7 @@
 #include "talk/base/criticalsection.h"
 #include "talk/base/socketserver.h"
 #include "talk/base/time.h"
+#include <string.h>
 #include <vector>
 #include <queue>
 #include <algorithm>
diff --git a/talk/base/physicalsocketserver.cc b/talk/base/physicalsocketserver.cc
index adb61de..a16f05f 100644
--- a/talk/base/physicalsocketserver.cc
+++ b/talk/base/physicalsocketserver.cc
@@ -52,6 +52,9 @@ extern "C" {
 #define IP_MTU 14 // Until this is integrated from linux/in.h to netinet/in.h
 #endif  // __linux
 
+#include <string.h>
+#include <algorithm>
+
 #ifdef WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -59,7 +62,6 @@ extern "C" {
 #include <windows.h>
 #undef SetPort
 
-#include <algorithm>
 #include <iostream>
 
 class WinsockInitializer {
diff --git a/talk/base/socketadapters.cc b/talk/base/socketadapters.cc
index fa90edf..c533220 100644
--- a/talk/base/socketadapters.cc
+++ b/talk/base/socketadapters.cc
@@ -41,6 +41,7 @@
 #include <security.h>
 #endif
 
+#include <cstring>
 #include <cassert>
 
 #include "talk/base/base64.h"
diff --git a/talk/base/stream.cc b/talk/base/stream.cc
index c22d984..8ce6ad7 100644
--- a/talk/base/stream.cc
+++ b/talk/base/stream.cc
@@ -28,6 +28,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <errno.h>
+#include <string.h>
 #include <string>
 #include "talk/base/basictypes.h"
 #include "talk/base/common.h"
diff --git a/talk/base/stringutils.h b/talk/base/stringutils.h
index 4fdffe8..6ea5940 100644
--- a/talk/base/stringutils.h
+++ b/talk/base/stringutils.h
@@ -36,6 +36,7 @@
 #endif  // WIN32
 
 #include <string>
+#include <string.h>
 
 ///////////////////////////////////////////////////////////////////////////////
 // Rename a bunch of common string functions so they are consistent across
diff --git a/talk/base/xmpppassword.h b/talk/base/xmpppassword.h
index f431b4e..22167d5 100644
--- a/talk/base/xmpppassword.h
+++ b/talk/base/xmpppassword.h
@@ -28,6 +28,7 @@
 #ifndef _XMPPPASSWORD_H_
 #define _XMPPPASSWORD_H_
 
+#include <string.h>
 #include "talk/base/linked_ptr.h"
 #include "talk/base/scoped_ptr.h"
 
diff --git a/talk/p2p/base/port.cc b/talk/p2p/base/port.cc
index f9331ed..6e08073 100644
--- a/talk/p2p/base/port.cc
+++ b/talk/p2p/base/port.cc
@@ -39,6 +39,7 @@
 #include <algorithm>
 #include <iostream>
 #include <cassert>
+#include <cstring>
 #include <vector>
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
diff --git a/talk/p2p/base/pseudotcp.cc b/talk/p2p/base/pseudotcp.cc
index 24aa7b4..fa04ce3 100644
--- a/talk/p2p/base/pseudotcp.cc
+++ b/talk/p2p/base/pseudotcp.cc
@@ -33,6 +33,8 @@
 #include "talk/base/socket.h"
 #include "talk/base/time.h"
 #include "talk/p2p/base/pseudotcp.h"
+#include <string.h>
+#include <stdlib.h>
 
 #define _DBG_NONE		  0
 #define _DBG_NORMAL		1
diff --git a/talk/p2p/base/relayport.cc b/talk/p2p/base/relayport.cc
index dd5b420..9825a07 100644
--- a/talk/p2p/base/relayport.cc
+++ b/talk/p2p/base/relayport.cc
@@ -34,6 +34,7 @@
 #include "talk/p2p/base/helpers.h"
 #include <iostream>
 #include <cassert>
+#include <cstring>
 #ifdef OSX
 #include <errno.h>
 #endif
diff --git a/talk/p2p/base/relayserver_main.cc b/talk/p2p/base/relayserver_main.cc
index fd2ee27..68f18f0 100644
--- a/talk/p2p/base/relayserver_main.cc
+++ b/talk/p2p/base/relayserver_main.cc
@@ -26,6 +26,7 @@
  */
 
 #include <cassert>
+#include <cstring>
 #include <iostream>
 #include "talk/base/host.h"
 #include "talk/base/thread.h"
diff --git a/talk/p2p/base/stun.cc b/talk/p2p/base/stun.cc
index 6a22b23..1407ed8 100644
--- a/talk/p2p/base/stun.cc
+++ b/talk/p2p/base/stun.cc
@@ -27,6 +27,7 @@
 
 #include "talk/base/logging.h"
 #include "talk/p2p/base/stun.h"
+#include <cstring>
 #include <iostream>
 #include <cassert>
 
diff --git a/talk/p2p/base/stunserver.cc b/talk/p2p/base/stunserver.cc
index 6e4f6b6..c6d9f9f 100644
--- a/talk/p2p/base/stunserver.cc
+++ b/talk/p2p/base/stunserver.cc
@@ -28,6 +28,7 @@
 #include "talk/base/bytebuffer.h"
 #include "talk/p2p/base/stunserver.h"
 #include <iostream>
+#include <cstring>
 
 #ifdef POSIX
 extern "C" {
diff --git a/talk/p2p/base/stunserver_main.cc b/talk/p2p/base/stunserver_main.cc
index bd8a96e..bac3e35 100644
--- a/talk/p2p/base/stunserver_main.cc
+++ b/talk/p2p/base/stunserver_main.cc
@@ -29,6 +29,7 @@
 #include "talk/base/thread.h"
 #include "talk/p2p/base/stunserver.h"
 #include <iostream>
+#include <cstring>
 
 #ifdef POSIX
 extern "C" {
diff --git a/talk/p2p/base/tcpport.cc b/talk/p2p/base/tcpport.cc
index 06bf3b5..da93a28 100644
--- a/talk/p2p/base/tcpport.cc
+++ b/talk/p2p/base/tcpport.cc
@@ -35,6 +35,7 @@
 #endif // WIN32
 #include <iostream>
 #include <cassert>
+#include <cstring>
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
 namespace std {

-- 
libjingle0.3 packaging

More information about the Pkg-telepathy-commits mailing list