10 files changed, 16 insertions, 17 deletions
diff --git a/webrtc/libjingle/xmpp/chatroommoduleimpl.cc b/webrtc/libjingle/xmpp/chatroommoduleimpl.cc
index 546aa75f92..52fba4cbae 100644
--- a/webrtc/libjingle/xmpp/chatroommoduleimpl.cc
+++ b/webrtc/libjingle/xmpp/chatroommoduleimpl.cc
@@ -17,6 +17,7 @@
 #include "webrtc/libjingle/xmpp/chatroommodule.h"
 #include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/libjingle/xmpp/moduleimpl.h"
+#include "webrtc/base/arraysize.h"
 #include "webrtc/base/common.h"
 
 namespace buzz {
@@ -535,7 +536,7 @@ XmppChatroomModuleImpl::ChangePresence(XmppChatroomState new_state,
 
   // find the right transition description
   StateTransitionDescription* transition_desc = NULL;
-  for (int i=0; i < ARRAY_SIZE(Transitions); i++) {
+  for (size_t i = 0; i < arraysize(Transitions); i++) {
     if (Transitions[i].old_state == old_state &&
         Transitions[i].new_state == new_state) {
         transition_desc = &Transitions[i];
diff --git a/webrtc/libjingle/xmpp/constants.cc b/webrtc/libjingle/xmpp/constants.cc
index 38e0cec48d..6ad2a5aa37 100644
--- a/webrtc/libjingle/xmpp/constants.cc
+++ b/webrtc/libjingle/xmpp/constants.cc
@@ -16,7 +16,6 @@
 #include "webrtc/libjingle/xmllite/xmlconstants.h"
 #include "webrtc/libjingle/xmllite/xmlelement.h"
 #include "webrtc/libjingle/xmpp/jid.h"
-#include "webrtc/base/basicdefs.h"
 
 namespace buzz {
 
diff --git a/webrtc/libjingle/xmpp/presenceouttask.cc b/webrtc/libjingle/xmpp/presenceouttask.cc
index aa19c9dd77..5519a4fd4a 100644
--- a/webrtc/libjingle/xmpp/presenceouttask.cc
+++ b/webrtc/libjingle/xmpp/presenceouttask.cc
@@ -13,6 +13,7 @@
 #include "webrtc/libjingle/xmpp/constants.h"
 #include "webrtc/libjingle/xmpp/presenceouttask.h"
 #include "webrtc/libjingle/xmpp/xmppclient.h"
+#include "webrtc/base/arraysize.h"
 #include "webrtc/base/stringencode.h"
 
 namespace buzz {
@@ -128,7 +129,7 @@ PresenceOutTask::TranslateStatus(const PresenceStatus & s) {
       time(&current_time_seconds);
       struct tm* current_time = gmtime(&current_time_seconds);
       char output[256];
-      strftime(output, ARRAY_SIZE(output), "%Y%m%dT%H:%M:%S", current_time);
+      strftime(output, arraysize(output), "%Y%m%dT%H:%M:%S", current_time);
       result->AddAttr(kQnStamp, output, 1);
     }
   }
diff --git a/webrtc/libjingle/xmpp/xmppclient.cc b/webrtc/libjingle/xmpp/xmppclient.cc
index 7c2a5e693c..f7e88c3927 100644
--- a/webrtc/libjingle/xmpp/xmppclient.cc
+++ b/webrtc/libjingle/xmpp/xmppclient.cc
@@ -362,7 +362,7 @@ void XmppClient::Private::OnSocketRead() {
     if (bytes_read == 0)
       return;
 
-//#ifdef _DEBUG
+//#if !defined(NDEBUG)
     client_->SignalLogInput(bytes, static_cast<int>(bytes_read));
 //#endif
 
@@ -386,7 +386,7 @@ void XmppClient::Private::OnStateChange(int state) {
 }
 
 void XmppClient::Private::WriteOutput(const char* bytes, size_t len) {
-//#ifdef _DEBUG
+//#if !defined(NDEBUG)
   client_->SignalLogOutput(bytes, static_cast<int>(len));
 //#endif
 
diff --git a/webrtc/libjingle/xmpp/xmppclient.h b/webrtc/libjingle/xmpp/xmppclient.h
index 7b9eb7ab74..84ca6c1418 100644
--- a/webrtc/libjingle/xmpp/xmppclient.h
+++ b/webrtc/libjingle/xmpp/xmppclient.h
@@ -16,7 +16,6 @@
 #include "webrtc/libjingle/xmpp/xmppclientsettings.h"
 #include "webrtc/libjingle/xmpp/xmppengine.h"
 #include "webrtc/libjingle/xmpp/xmpptask.h"
-#include "webrtc/base/basicdefs.h"
 #include "webrtc/base/sigslot.h"
 #include "webrtc/base/task.h"
 
diff --git a/webrtc/libjingle/xmpp/xmpplogintask.cc b/webrtc/libjingle/xmpp/xmpplogintask.cc
index f5745cd979..e39713d463 100644
--- a/webrtc/libjingle/xmpp/xmpplogintask.cc
+++ b/webrtc/libjingle/xmpp/xmpplogintask.cc
@@ -25,7 +25,7 @@ using rtc::ConstantLabel;
 
 namespace buzz {
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
 const ConstantLabel XmppLoginTask::LOGINTASK_STATES[] = {
   KLABEL(LOGINSTATE_INIT),
   KLABEL(LOGINSTATE_STREAMSTART_SENT),
@@ -40,7 +40,7 @@ const ConstantLabel XmppLoginTask::LOGINTASK_STATES[] = {
   KLABEL(LOGINSTATE_DONE),
   LASTLABEL
 };
-#endif  // _DEBUG
+#endif
 XmppLoginTask::XmppLoginTask(XmppEngineImpl * pctx) :
   pctx_(pctx),
   authNeeded_(true),
@@ -84,10 +84,10 @@ XmppLoginTask::Advance() {
 
     const XmlElement * element = NULL;
 
-#if _DEBUG
+#if !defined(NDEBUG)
     LOG(LS_VERBOSE) << "XmppLoginTask::Advance - "
       << rtc::ErrorName(state_, LOGINTASK_STATES);
-#endif  // _DEBUG
+#endif
 
     switch (state_) {
 
diff --git a/webrtc/libjingle/xmpp/xmpplogintask.h b/webrtc/libjingle/xmpp/xmpplogintask.h
index 58e0a2f3fa..f69a648394 100644
--- a/webrtc/libjingle/xmpp/xmpplogintask.h
+++ b/webrtc/libjingle/xmpp/xmpplogintask.h
@@ -77,9 +77,9 @@ private:
 
   rtc::scoped_ptr<SaslMechanism> sasl_mech_;
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
   static const rtc::ConstantLabel LOGINTASK_STATES[];
-#endif  // _DEBUG
+#endif
 };
 
 }
diff --git a/webrtc/libjingle/xmpp/xmppsocket.cc b/webrtc/libjingle/xmpp/xmppsocket.cc
index d67a71fe43..25e03efbe9 100644
--- a/webrtc/libjingle/xmpp/xmppsocket.cc
+++ b/webrtc/libjingle/xmpp/xmppsocket.cc
@@ -15,7 +15,6 @@
 #endif
 
 #include <errno.h>
-#include "webrtc/base/basicdefs.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/thread.h"
 #ifdef FEATURE_ENABLE_SSL
diff --git a/webrtc/libjingle/xmpp/xmpptask.cc b/webrtc/libjingle/xmpp/xmpptask.cc
index 09067058ae..84f9ba6b92 100644
--- a/webrtc/libjingle/xmpp/xmpptask.cc
+++ b/webrtc/libjingle/xmpp/xmpptask.cc
@@ -24,7 +24,7 @@ XmppClientInterface::~XmppClientInterface() {
 XmppTask::XmppTask(XmppTaskParentInterface* parent,
                    XmppEngine::HandlerLevel level)
     : XmppTaskBase(parent), stopped_(false) {
-#ifdef _DEBUG
+#if !defined(NDEBUG)
   debug_force_timeout_ = false;
 #endif
 
@@ -70,7 +70,7 @@ void XmppTask::OnDisconnect() {
 }
 
 void XmppTask::QueueStanza(const XmlElement* stanza) {
-#ifdef _DEBUG
+#if !defined(NDEBUG)
   if (debug_force_timeout_)
     return;
 #endif
diff --git a/webrtc/libjingle/xmpp/xmpptask.h b/webrtc/libjingle/xmpp/xmpptask.h
index 5b97e89c97..36351b7fa8 100644
--- a/webrtc/libjingle/xmpp/xmpptask.h
+++ b/webrtc/libjingle/xmpp/xmpptask.h
@@ -119,7 +119,7 @@ class XmppTask : public XmppTaskBase,
   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
 
@@ -162,7 +162,7 @@ private:
   rtc::scoped_ptr<XmlElement> next_stanza_;
   std::string id_;
 
-#ifdef _DEBUG
+#if !defined(NDEBUG)
   bool debug_force_timeout_;
 #endif
 };