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

[Simon McVittie]

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

    Patch originally from Martin Michlmayr to fix failure to build from source on a g++ 4.4 prerelease
    
    From Debian #505699, rebased onto 0.3.12.

diff --git a/talk/base/logging.cc b/talk/base/logging.cc
index 8702b82..2830512 100644
--- a/talk/base/logging.cc
+++ b/talk/base/logging.cc
@@ -31,9 +31,10 @@
 #undef ERROR  // wingdi.h
 #endif
 
+#include <cstdio>
+#include <cstring>
 #include <iostream>
 #include <iomanip>
-#include <string.h>
 
 #include "talk/base/logging.h"
 #include "talk/base/stream.h"
diff --git a/talk/base/stream.cc b/talk/base/stream.cc
index 090a0ae..e958ade 100644
--- a/talk/base/stream.cc
+++ b/talk/base/stream.cc
@@ -27,6 +27,7 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <cstdio>
 #include <errno.h>
 #include <string>
 #include <string.h>

-- 
libjingle0.3 packaging