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

5 files changed, 13 insertions, 13 deletions

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                         
 };