Use NDEBUG instead of _DEBUG for libjingle. This makes it so that debug code is used on non-Windows platforms, too.

BUG=31255
TEST=trybots

Review URL: http://codereview.chromium.org/542004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@36085 0039d316-1c4b-4281-b951-d872f2087c98

15 files changed, 226 insertions, 43 deletions

diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 5b177c8..fcfd15d 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -43,3 +43,5 @@ Local Modifications:
   * Added a CreateSSLAdapter() function to SocketFactory to allow SSL
     adapter creation behavior to be overridden.
   * Improved handling and error-checking of SSL adapters.
+  * Changed uses of Windows-only debug variable _DEBUG to use the
+    cross-platform NDEBUG variable instead.
\ No newline at end of file
diff --git a/third_party/libjingle/files/talk/base/criticalsection.h b/third_party/libjingle/files/talk/base/criticalsection.h
index 937c5bb..9fa5aa5 100644
--- a/third_party/libjingle/files/talk/base/criticalsection.h
+++ b/third_party/libjingle/files/talk/base/criticalsection.h
@@ -36,9 +36,9 @@
 #include <pthread.h>
 #endif
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 #define CS_TRACK_OWNER 1
-#endif  // _DEBUG
+#endif  // !defined(NDEBUG)
 
 #if CS_TRACK_OWNER
 #define TRACK_OWNER(x) x
diff --git a/third_party/libjingle/files/talk/base/diskcache.cc b/third_party/libjingle/files/talk/base/diskcache.cc
index 44e37d9..686e499 100644
--- a/third_party/libjingle/files/talk/base/diskcache.cc
+++ b/third_party/libjingle/files/talk/base/diskcache.cc
@@ -40,11 +40,11 @@
 #include "talk/base/stringencode.h"
 #include "talk/base/stringutils.h"
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 #define TRANSPARENT_CACHE_NAMES 1
-#else  // !_DEBUG
+#else  // defined(NDEBUG)
 #define TRANSPARENT_CACHE_NAMES 0
-#endif  // !_DEBUG
+#endif  // !defined(NDEBUG)
 
 namespace talk_base {
 
@@ -228,14 +228,14 @@ bool DiskCache::DeleteResource(const std::string& id) {
 }
 
 bool DiskCache::CheckLimit() {
-#ifdef _DEBUG
+#if !defined(NDEBUG)
   // Temporary check to make sure everything is working correctly.
   size_t cache_size = 0;
   for (EntryMap::iterator it = map_.begin(); it != map_.end(); ++it) {
     cache_size += it->second.size;
   }
   ASSERT(cache_size == total_size_);
-#endif  // _DEBUG
+#endif  // !defined(NDEBUG)
 
   // TODO: Replace this with a non-brain-dead algorithm for clearing out the
   // oldest resources... something that isn't O(n^2)
diff --git a/third_party/libjingle/files/talk/base/openssladapter.cc b/third_party/libjingle/files/talk/base/openssladapter.cc
index 1d4f02c..40ec6f1 100644
--- a/third_party/libjingle/files/talk/base/openssladapter.cc
+++ b/third_party/libjingle/files/talk/base/openssladapter.cc
@@ -616,7 +616,7 @@ OpenSSLAdapter::SSLPostConnectionCheck(SSL* ssl, const char* host) {
   if (!certificate)
     return false;
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
   {
     LOG(LS_INFO) << "Certificate from server:";
     BIO* mem = BIO_new(BIO_s_mem());
@@ -704,7 +704,7 @@ OpenSSLAdapter::SSLPostConnectionCheck(SSL* ssl, const char* host) {
   return ok;
 }
 
-#if _DEBUG
+#if !defined(NDEBUG)
 
 // We only use this for tracing and so it is only needed in debug mode
 
@@ -733,11 +733,11 @@ OpenSSLAdapter::SSLInfoCallback(const SSL* s, int where, int ret) {
   }
 }
 
-#endif  // _DEBUG
+#endif  // !defined(NDEBUG)
 
 int
 OpenSSLAdapter::SSLVerifyCallback(int ok, X509_STORE_CTX* store) {
-#if _DEBUG
+#if !defined(NDEBUG)
   if (!ok) {
     char data[256];
     X509* cert = X509_STORE_CTX_get_current_cert(store);
@@ -795,7 +795,7 @@ OpenSSLAdapter::SetupSSLContext() {
     return NULL;
   }
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
   SSL_CTX_set_info_callback(ctx, SSLInfoCallback);
 #endif
 
diff --git a/third_party/libjingle/files/talk/base/openssladapter.h b/third_party/libjingle/files/talk/base/openssladapter.h
index b794a7b..33ffdeb 100644
--- a/third_party/libjingle/files/talk/base/openssladapter.h
+++ b/third_party/libjingle/files/talk/base/openssladapter.h
@@ -69,9 +69,9 @@ private:
   void Cleanup();
 
   bool SSLPostConnectionCheck(SSL* ssl, const char* host);
-#if _DEBUG
+#if !defined(NDEBUG)
   static void SSLInfoCallback(const SSL* s, int where, int ret);
-#endif  // !_DEBUG
+#endif  // !defined(NDEBUG)
   static int SSLVerifyCallback(int ok, X509_STORE_CTX* store);
 
   static SSL_CTX* SetupSSLContext();
diff --git a/third_party/libjingle/files/talk/base/sigslot.h b/third_party/libjingle/files/talk/base/sigslot.h
index 539db8a..c9f9645 100644
--- a/third_party/libjingle/files/talk/base/sigslot.h
+++ b/third_party/libjingle/files/talk/base/sigslot.h
@@ -527,7 +527,7 @@ namespace sigslot {
 			m_connected_slots.erase(m_connected_slots.begin(), m_connected_slots.end());
 		}
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 			bool connected(has_slots<mt_policy>* pclass)
 		{
 			lock_block<mt_policy> lock(this);
@@ -673,7 +673,7 @@ namespace sigslot {
 			m_connected_slots.erase(m_connected_slots.begin(), m_connected_slots.end());
 		}
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 			bool connected(has_slots<mt_policy>* pclass)
 		{
 			lock_block<mt_policy> lock(this);
@@ -804,7 +804,7 @@ namespace sigslot {
 			m_connected_slots.erase(m_connected_slots.begin(), m_connected_slots.end());
 		}
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 			bool connected(has_slots<mt_policy>* pclass)
 		{
 			lock_block<mt_policy> lock(this);
@@ -934,7 +934,7 @@ namespace sigslot {
 			m_connected_slots.erase(m_connected_slots.begin(), m_connected_slots.end());
 		}
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 			bool connected(has_slots<mt_policy>* pclass)
 		{
 			lock_block<mt_policy> lock(this);
@@ -1064,7 +1064,7 @@ namespace sigslot {
 			m_connected_slots.erase(m_connected_slots.begin(), m_connected_slots.end());
 		}
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 			bool connected(has_slots<mt_policy>* pclass)
 		{
 			lock_block<mt_policy> lock(this);
@@ -1196,7 +1196,7 @@ namespace sigslot {
 			m_connected_slots.erase(m_connected_slots.begin(), m_connected_slots.end());
 		}
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 			bool connected(has_slots<mt_policy>* pclass)
 		{
 			lock_block<mt_policy> lock(this);
@@ -1328,7 +1328,7 @@ namespace sigslot {
 			m_connected_slots.erase(m_connected_slots.begin(), m_connected_slots.end());
 		}
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 			bool connected(has_slots<mt_policy>* pclass)
 		{
 			lock_block<mt_policy> lock(this);
@@ -1460,7 +1460,7 @@ namespace sigslot {
 			m_connected_slots.erase(m_connected_slots.begin(), m_connected_slots.end());
 		}
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 			bool connected(has_slots<mt_policy>* pclass)
 		{
 			lock_block<mt_policy> lock(this);
@@ -1593,7 +1593,7 @@ namespace sigslot {
 			m_connected_slots.erase(m_connected_slots.begin(), m_connected_slots.end());
 		}
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 			bool connected(has_slots<mt_policy>* pclass)
 		{
 			lock_block<mt_policy> lock(this);
diff --git a/third_party/libjingle/files/talk/base/socketaddress.cc b/third_party/libjingle/files/talk/base/socketaddress.cc
index e3a04d1..a6f0dd8 100644
--- a/third_party/libjingle/files/talk/base/socketaddress.cc
+++ b/third_party/libjingle/files/talk/base/socketaddress.cc
@@ -49,11 +49,11 @@ int inet_aton(const char * cp, struct in_addr * inp) {
 }
 #endif // WIN32
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 #define DISABLE_DNS 0
-#else // !_DEBUG
+#else // defined(NDEBUG)
 #define DISABLE_DNS 0
-#endif // !_DEBUG
+#endif // !defined(NDEBUG)
 
 namespace talk_base {
 
diff --git a/third_party/libjingle/files/talk/base/stringencode.cc b/third_party/libjingle/files/talk/base/stringencode.cc
index 3c3dae8..ffae6fe 100644
--- a/third_party/libjingle/files/talk/base/stringencode.cc
+++ b/third_party/libjingle/files/talk/base/stringencode.cc
@@ -523,7 +523,7 @@ void sprintf(std::string& value, size_t maxlen, const char * format, ...) {
 // Unit Tests
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 
 static int utf8_unittest() {
   const struct Utf8Test {
@@ -573,7 +573,7 @@ static int utf8_unittest() {
 
 int test = utf8_unittest();
 
-#endif  // _DEBUG
+#endif  // !defined(NDEBUG)
 
 /////////////////////////////////////////////////////////////////////////////
 
diff --git a/third_party/libjingle/files/talk/base/stringutils.cc b/third_party/libjingle/files/talk/base/stringutils.cc
index 1e43637..7ade7e5 100644
--- a/third_party/libjingle/files/talk/base/stringutils.cc
+++ b/third_party/libjingle/files/talk/base/stringutils.cc
@@ -69,11 +69,11 @@ size_t asccpyn(wchar_t* buffer, size_t buflen,
   } else if (srclen >= buflen) {
     srclen = buflen - 1;
   }
-#if _DEBUG
+#if !defined(NDEBUG)
   // Double check that characters are not UTF-8
   for (size_t pos = 0; pos < srclen; ++pos)
     ASSERT(static_cast<unsigned char>(source[pos]) < 128);
-#endif  // _DEBUG
+#endif  // !defined(NDEBUG)
   std::copy(source, source + srclen, buffer);
   buffer[srclen] = 0;
   return srclen;
diff --git a/third_party/libjingle/files/talk/xmpp/xmppclient.cc b/third_party/libjingle/files/talk/xmpp/xmppclient.cc
index 4f31890..c8e9a4b3 100644
--- a/third_party/libjingle/files/talk/xmpp/xmppclient.cc
+++ b/third_party/libjingle/files/talk/xmpp/xmppclient.cc
@@ -344,7 +344,7 @@ XmppClient::Private::OnSocketRead() {
     if (bytes_read == 0)
       return;
 
-//#ifdef _DEBUG
+//#if !defined(NDEBUG)
     client_->SignalLogInput(bytes, bytes_read);
 //#endif
 
@@ -372,7 +372,7 @@ XmppClient::Private::OnStateChange(int state) {
 void
 XmppClient::Private::WriteOutput(const char * bytes, size_t len) {
 
-//#ifdef _DEBUG
+//#if !defined(NDEBUG)
   client_->SignalLogOutput(bytes, len);
 //#endif
 
diff --git a/third_party/libjingle/files/talk/xmpp/xmpplogintask.cc b/third_party/libjingle/files/talk/xmpp/xmpplogintask.cc
index 2ce3d175..04c8dd1 100644
--- a/third_party/libjingle/files/talk/xmpp/xmpplogintask.cc
+++ b/third_party/libjingle/files/talk/xmpp/xmpplogintask.cc
@@ -41,7 +41,7 @@ using talk_base::ConstantLabel;
 
 namespace buzz {
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 const ConstantLabel XmppLoginTask::LOGINTASK_STATES[] = {
   KLABEL(LOGINSTATE_INIT),
   KLABEL(LOGINSTATE_STREAMSTART_SENT),
@@ -56,7 +56,7 @@ const ConstantLabel XmppLoginTask::LOGINTASK_STATES[] = {
   KLABEL(LOGINSTATE_DONE),
   LASTLABEL
 };
-#endif  // _DEBUG
+#endif  // !defined(NDEBUG)
 
 XmppLoginTask::XmppLoginTask(XmppEngineImpl * pctx) :
   pctx_(pctx),
@@ -100,10 +100,10 @@ XmppLoginTask::Advance() {
 
     const XmlElement * element = NULL;
 
-#if _DEBUG
+#if !defined(NDEBUG)
     LOG(LS_VERBOSE) << "XmppLoginTask::Advance - "
       << talk_base::ErrorName(state_, LOGINTASK_STATES);
-#endif  // _DEBUG
+#endif  // !defined(NDEBUG)
 
     switch (state_) {
 
diff --git a/third_party/libjingle/files/talk/xmpp/xmpplogintask.h b/third_party/libjingle/files/talk/xmpp/xmpplogintask.h
index 993a6bf..f6c7d20 100644
--- a/third_party/libjingle/files/talk/xmpp/xmpplogintask.h
+++ b/third_party/libjingle/files/talk/xmpp/xmpplogintask.h
@@ -90,9 +90,9 @@ private:
   
   scoped_ptr<SaslMechanism> sasl_mech_;
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
   static const talk_base::ConstantLabel LOGINTASK_STATES[];
-#endif  // _DEBUG
+#endif  // !defined(NDEBUG)
 };
 
 }
diff --git a/third_party/libjingle/files/talk/xmpp/xmpptask.cc b/third_party/libjingle/files/talk/xmpp/xmpptask.cc
index 75334ae..fe8aebe 100644
--- a/third_party/libjingle/files/talk/xmpp/xmpptask.cc
+++ b/third_party/libjingle/files/talk/xmpp/xmpptask.cc
@@ -37,7 +37,7 @@ RateLimitManager task_rate_manager;
 
 XmppTask::XmppTask(Task* parent, XmppEngine::HandlerLevel level)
     : Task(parent), client_(NULL) {
-#ifdef _DEBUG
+#if !defined(NDEBUG)
   debug_force_timeout_ = false;
 #endif
 
@@ -85,7 +85,7 @@ void XmppTask::OnDisconnect() {
 }
 
 void XmppTask::QueueStanza(const XmlElement* stanza) {
-#ifdef _DEBUG
+#if !defined(NDEBUG)
   if (debug_force_timeout_)
     return;
 #endif
@@ -171,4 +171,4 @@ bool XmppTask::VerifyTaskRateLimit(const std::string task_name, int max_count,
                                            per_x_seconds);
 }
 
-}
\ No newline at end of file
+}
diff --git a/third_party/libjingle/files/talk/xmpp/xmpptask.h b/third_party/libjingle/files/talk/xmpp/xmpptask.h
index 156c9a5..fc8e076 100644
--- a/third_party/libjingle/files/talk/xmpp/xmpptask.h
+++ b/third_party/libjingle/files/talk/xmpp/xmpptask.h
@@ -77,7 +77,7 @@ class XmppTask :
   std::string task_id() const { return id_; }
   void set_task_id(std::string id) { id_ = id; }
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
   void set_debug_force_timeout(const bool f) { debug_force_timeout_ = f; }
 #endif
 
@@ -120,7 +120,7 @@ private:
   scoped_ptr<XmlElement> next_stanza_;
   std::string id_;
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
   bool debug_force_timeout_;
 #endif                         
 };
diff --git a/third_party/libjingle/mods-since-v0_4_0.diff b/third_party/libjingle/mods-since-v0_4_0.diff
index afddbc2..b4a594d 100644
--- a/third_party/libjingle/mods-since-v0_4_0.diff
+++ b/third_party/libjingle/mods-since-v0_4_0.diff
@@ -280,6 +280,14 @@ diff -r libjingle-0.4.0/talk/base/common.h libjingle/files/talk/base/common.h
 <   void operator=(const TypeName&)
 < 
 diff -r libjingle-0.4.0/talk/base/criticalsection.h libjingle/files/talk/base/criticalsection.h
+39c39
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+41c41
+< #endif  // _DEBUG
+---
+> #endif  // !defined(NDEBUG)
 83c83
 < public:
 ---
@@ -309,6 +317,27 @@ diff -r libjingle-0.4.0/talk/base/criticalsection.h libjingle/files/talk/base/cr
 diff -r libjingle-0.4.0/talk/base/cryptstring.h libjingle/files/talk/base/cryptstring.h
 30a31
 > #include <string.h>
+diff -r libjingle-0.4.0/talk/base/diskcache.cc libjingle/files/talk/base/diskcache.cc
+43c43
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+45c45
+< #else  // !_DEBUG
+---
+> #else  // defined(NDEBUG)
+47c47
+< #endif  // !_DEBUG
+---
+> #endif  // !defined(NDEBUG)
+231c231
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+238c238
+< #endif  // _DEBUG
+---
+> #endif  // !defined(NDEBUG)
 diff -r libjingle-0.4.0/talk/base/diskcache_win32.cc libjingle/files/talk/base/diskcache_win32.cc
 38c38
 <       entry->streams = max(entry->streams, index + 1);
@@ -408,6 +437,36 @@ diff -r libjingle-0.4.0/talk/base/natserver.cc libjingle/files/talk/base/natserv
 diff -r libjingle-0.4.0/talk/base/natsocketfactory.cc libjingle/files/talk/base/natsocketfactory.cc
 29a30
 > #include <cstring>
+diff -r libjingle-0.4.0/talk/base/openssladapter.cc libjingle/files/talk/base/openssladapter.cc
+619c619
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+707c707
+< #if _DEBUG
+---
+> #if !defined(NDEBUG)
+736c736
+< #endif  // _DEBUG
+---
+> #endif  // !defined(NDEBUG)
+740c740
+< #if _DEBUG
+---
+> #if !defined(NDEBUG)
+798c798
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+diff -r libjingle-0.4.0/talk/base/openssladapter.h libjingle/files/talk/base/openssladapter.h
+72c72
+< #if _DEBUG
+---
+> #if !defined(NDEBUG)
+74c74
+< #endif  // !_DEBUG
+---
+> #endif  // !defined(NDEBUG)
 diff -r libjingle-0.4.0/talk/base/physicalsocketserver.cc libjingle/files/talk/base/physicalsocketserver.cc
 61a62
 > #include "talk/base/winsock_initializer.h"
@@ -844,6 +903,43 @@ diff -r libjingle-0.4.0/talk/base/signalthread.h libjingle/files/talk/base/signa
 >     kComplete,        // Work is done
 >     kStopping,        // Work is being interrupted
 >   } state_;
+diff -r libjingle-0.4.0/talk/base/sigslot.h libjingle/files/talk/base/sigslot.h
+530c530
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+676c676
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+807c807
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+937c937
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+1067c1067
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+1199c1199
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+1331c1331
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+1463c1463
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+1596c1596
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
 diff -r libjingle-0.4.0/talk/base/socket.h libjingle/files/talk/base/socket.h
 77a78
 > #undef ETIMEDOUT // remove pthread.h's definition
@@ -851,6 +947,19 @@ diff -r libjingle-0.4.0/talk/base/socketadapters.cc libjingle/files/talk/base/so
 43a44,45
 > #include <cstring>
 > 
+diff -r libjingle-0.4.0/talk/base/socketaddress.cc libjingle/files/talk/base/socketaddress.cc
+52c52
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+54c54
+< #else // !_DEBUG
+---
+> #else // defined(NDEBUG)
+56c56
+< #endif // !_DEBUG
+---
+> #endif // !defined(NDEBUG)
 diff -r libjingle-0.4.0/talk/base/socketfactory.h libjingle/files/talk/base/socketfactory.h
 32a33
 > #include "talk/base/ssladapter.h"
@@ -883,6 +992,23 @@ diff -r libjingle-0.4.0/talk/base/stream.cc libjingle/files/talk/base/stream.cc
 diff -r libjingle-0.4.0/talk/base/stringencode.cc libjingle/files/talk/base/stringencode.cc
 34a35
 > #include <stdlib.h>
+525c526
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+575c576
+< #endif  // _DEBUG
+---
+> #endif  // !defined(NDEBUG)
+diff -r libjingle-0.4.0/talk/base/stringutils.cc libjingle/files/talk/base/stringutils.cc
+72c72
+< #if _DEBUG
+---
+> #if !defined(NDEBUG)
+76c76
+< #endif  // _DEBUG
+---
+> #endif  // !defined(NDEBUG)
 diff -r libjingle-0.4.0/talk/base/stringutils.h libjingle/files/talk/base/stringutils.h
 33a34
 > #include <string.h>
@@ -1277,6 +1403,14 @@ diff -r libjingle-0.4.0/talk/xmpp/xmppclient.cc libjingle/files/talk/xmpp/xmppcl
 < #include "talk/xmpp/constants.h"
 ---
 > #include "talk/xmpp/xmppconstants.h"
+347c347
+< //#ifdef _DEBUG
+---
+> //#if !defined(NDEBUG)
+375c375
+< //#ifdef _DEBUG
+---
+> //#if !defined(NDEBUG)
 diff -r libjingle-0.4.0/talk/xmpp/xmppclient.h libjingle/files/talk/xmpp/xmppclient.h
 141c141
 <   std::string XmppClient::GetStateName(int state) const {
@@ -1308,10 +1442,35 @@ diff -r libjingle-0.4.0/talk/xmpp/xmpplogintask.cc libjingle/files/talk/xmpp/xmp
 < #include "talk/xmpp/constants.h"
 ---
 > #include "talk/xmpp/xmppconstants.h"
+44c44
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+59c59
+< #endif  // _DEBUG
+---
+> #endif  // !defined(NDEBUG)
+103c103
+< #if _DEBUG
+---
+> #if !defined(NDEBUG)
+106c106
+< #endif  // _DEBUG
+---
+> #endif  // !defined(NDEBUG)
 218a219,221
 >         auth->SetAttr(QN_GOOGLE_ALLOW_NON_GOOGLE_ID_XMPP_LOGIN, "true");
 >         auth->SetAttr(QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT, "true");
 > 
+diff -r libjingle-0.4.0/talk/xmpp/xmpplogintask.h libjingle/files/talk/xmpp/xmpplogintask.h
+93c93
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+95c95
+< #endif  // _DEBUG
+---
+> #endif  // !defined(NDEBUG)
 diff -r libjingle-0.4.0/talk/xmpp/xmppstanzaparser.cc libjingle/files/talk/xmpp/xmppstanzaparser.cc
 32c32
 < #include "talk/xmpp/constants.h"
@@ -1322,3 +1481,25 @@ diff -r libjingle-0.4.0/talk/xmpp/xmpptask.cc libjingle/files/talk/xmpp/xmpptask
 < #include "talk/xmpp/constants.h"
 ---
 > #include "talk/xmpp/xmppconstants.h"
+40c40
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+88c88
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+174c174
+< }
+\ No newline at end of file
+---
+> }
+diff -r libjingle-0.4.0/talk/xmpp/xmpptask.h libjingle/files/talk/xmpp/xmpptask.h
+80c80
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)
+123c123
+< #ifdef _DEBUG
+---
+> #if !defined(NDEBUG)