jabbin/jabbin.patch

   1 diff -u -r 3.0-beta//iris/xmpp-im/xmpp_task.cpp 3.0-beta//iris/xmpp-im/xmpp_task.cpp
   2 --- 3.0-beta//iris/xmpp-im/xmpp_task.cpp        2010-02-04 16:28:07.000000000 +0200
   3 +++ 3.0-beta//iris/xmpp-im/xmpp_task.cpp        2010-03-08 10:38:40.618305274 +0200
   4 @@ -20,6 +20,8 @@
   5  #include <QTimer>
   6  #include <qplatformdefs.h>
   7
   8 +#include <stdio.h>
   9 +
  10  #include "safedelete.h"
  11  #include "xmpp_task.h"
  12  #include "xmpp_client.h"
  13 @@ -237,7 +239,7 @@
  14                 buf = new char[size];
  15                 va_list ap;
  16                 va_start(ap, fmt);
  17 -               r = QT_VSNPRINTF(buf, size, fmt, ap);
  18 +               r = vsnprintf(buf, size, fmt, ap);
  19                 va_end(ap);
  20
  21                 if(r != -1)
  22 diff -u -r 3.0-beta//third-party/libjingle-0.4.0/talk/base/logging.cc 3.0-beta//third-party/libjingle-0.4.0/talk/base/logging.cc
  23 --- 3.0-beta//third-party/libjingle-0.4.0/talk/base/logging.cc  2010-02-04 16:28:07.000000000 +0200
  24 +++ 3.0-beta//third-party/libjingle-0.4.0/talk/base/logging.cc  2010-03-08 11:04:36.938149347 +0200
  25 @@ -35,6 +35,8 @@
  26  #include <iostream>
  27  #include <iomanip>
  28
  29 +#include <stdio.h>
  30 +
  31  #include "talk/base/common.h"
  32  #include "talk/base/logging.h"
  33  #include "talk/base/stream.h"
  34 diff -u -r 3.0-beta//third-party/libjingle-0.4.0/talk/base/stream.h 3.0-beta//third-party/libjingle-0.4.0/talk/base/stream.h
  35 --- 3.0-beta//third-party/libjingle-0.4.0/talk/base/stream.h    2010-02-04 16:28:07.000000000 +0200
  36 +++ 3.0-beta//third-party/libjingle-0.4.0/talk/base/stream.h    2010-03-08 11:05:31.614812353 +0200
  37 @@ -28,6 +28,8 @@
  38  #ifndef TALK_BASE_STREAM_H__
  39  #define TALK_BASE_STREAM_H__
  40
  41 +#include <stdio.h>
  42 +
  43  #include "talk/base/basictypes.h"
  44  #include "talk/base/logging.h"
  45  #include "talk/base/scoped_ptr.h"
  46 diff -u -r 3.0-beta//third-party/libjingle-0.4.0/talk/session/phone/phonesessionclient.h 3.0-beta//third-party/libjingle-0.4.0/talk/session/phone/phonesessionclient.h
  47 --- 3.0-beta//third-party/libjingle-0.4.0/talk/session/phone/phonesessionclient.h       2010-02-04 16:28:07.000000000 +0200
  48 +++ 3.0-beta//third-party/libjingle-0.4.0/talk/session/phone/phonesessionclient.h       2010-03-08 11:08:30.424791783 +0200
  49 @@ -38,6 +38,7 @@
  50  #include "talk/p2p/base/sessionclient.h"
  51  #include "talk/p2p/base/sessiondescription.h"
  52  #include <map>
  53 +#include <stdio.h>
  54
  55  namespace cricket {
  56