linux: fix gcc 4.3 issues (for arm)

These are mostly minor syntax / missing header fixes.

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

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

18 files changed, 28 insertions, 10 deletions

diff --git a/chrome/browser/sync/engine/conflict_resolver.cc b/chrome/browser/sync/engine/conflict_resolver.cc
index a59faca..469d682 100644
--- a/chrome/browser/sync/engine/conflict_resolver.cc
+++ b/chrome/browser/sync/engine/conflict_resolver.cc
@@ -531,11 +531,12 @@ bool AttemptToFixUpdateEntryInDeletedLocalTree(WriteTransaction* trans,
     id = parent.Get(syncable::PARENT_ID);
   }
   // If we find we've been looping we re-root the hierarchy.
-  if (loop_detection < 0)
+  if (loop_detection < 0) {
     if (id == entry.Get(syncable::ID))
       reroot_id = entry.Get(syncable::PARENT_ID);
     else
       reroot_id = id;
+  }
   // Now we fix things up by undeleting all the folders in the item's path.
   id = parent_id;
   while (!id.IsRoot() && id != reroot_id) {
diff --git a/chrome/browser/sync/engine/syncer_util.cc b/chrome/browser/sync/engine/syncer_util.cc
index 8bd4819..8e32838 100644
--- a/chrome/browser/sync/engine/syncer_util.cc
+++ b/chrome/browser/sync/engine/syncer_util.cc
@@ -815,8 +815,8 @@ syncable::Id SyncerUtil::ComputePrevIdFromServerPosition(
       // If |candidate| is after |update_entry| according to the server
       // ordering, then we're done.  ID is the tiebreaker.
       if ((candidate.Get(SERVER_POSITION_IN_PARENT) > position_in_parent) ||
-          (candidate.Get(SERVER_POSITION_IN_PARENT) == position_in_parent) &&
-           (candidate.Get(ID) > update_item->Get(ID))) {
+          ((candidate.Get(SERVER_POSITION_IN_PARENT) == position_in_parent) &&
+           (candidate.Get(ID) > update_item->Get(ID)))) {
           return closest_sibling;
       }
     }
diff --git a/chrome/browser/sync/notifier/listener/listen_task.h b/chrome/browser/sync/notifier/listener/listen_task.h
index bd29d29..f8b32ce89 100644
--- a/chrome/browser/sync/notifier/listener/listen_task.h
+++ b/chrome/browser/sync/notifier/listener/listen_task.h
@@ -15,7 +15,7 @@
 #include "talk/xmpp/xmpptask.h"
 
 namespace buzz {
-class buzz::XmlElement;
+class XmlElement;
 class Jid;
 }
 
diff --git a/chrome/browser/sync/notifier/listener/mediator_thread_impl.h b/chrome/browser/sync/notifier/listener/mediator_thread_impl.h
index ecd7533..a31da53 100644
--- a/chrome/browser/sync/notifier/listener/mediator_thread_impl.h
+++ b/chrome/browser/sync/notifier/listener/mediator_thread_impl.h
@@ -33,11 +33,11 @@ class TaskPump;
 }  // namespace notifier
 
 namespace buzz {
-class buzz::XmppClient;
+class XmppClient;
 }  // namespace buzz
 
 namespace talk_base {
-class talk_base::SocketServer;
+class SocketServer;
 }  // namespace talk_base
 
 namespace browser_sync {
diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc
index 29d8430..550c495 100644
--- a/chrome/browser/sync/syncable/syncable.cc
+++ b/chrome/browser/sync/syncable/syncable.cc
@@ -1628,6 +1628,7 @@ MutableExtendedAttribute::MutableExtendedAttribute(
   ScopedKernelLock lock(trans->directory());
   if (!Init(trans, kernel, &lock, key)) {
     ExtendedAttributeValue val;
+    val.is_deleted = false;
     val.dirty = true;
     i_ = kernel->extended_attributes->insert(std::make_pair(key, val)).first;
     good_ = true;
diff --git a/chrome/browser/sync/util/character_set_converters_posix.cc b/chrome/browser/sync/util/character_set_converters_posix.cc
index d038f1f..ba57214 100644
--- a/chrome/browser/sync/util/character_set_converters_posix.cc
+++ b/chrome/browser/sync/util/character_set_converters_posix.cc
@@ -38,24 +38,26 @@ void TrimPathStringToValidCharacter(PathString* string) {
     PathChar c = string->at(string->length() - 1 - partial_enc_bytes);
     if ((c & 0x0c0) == 0x080)  // utf continuation char;
       continue;
-    if ((c & 0x0e0) == 0x0e0)  // 2-byte encoded char.
+    if ((c & 0x0e0) == 0x0e0) {  // 2-byte encoded char.
       if (1 == partial_enc_bytes)
         return;
       else
         break;
-    if ((c & 0x0f0) == 0xc0)  // 3-byte encoded char.
+    }
+    if ((c & 0x0f0) == 0xc0) {  // 3-byte encoded char.
       if (2 == partial_enc_bytes)
         return;
       else
         break;
-    if ((c & 0x0f8) == 0x0f0)  // 4-byte encoded char.
+    }
+    if ((c & 0x0f8) == 0x0f0) {  // 4-byte encoded char.
       if (3 == partial_enc_bytes)
         return;
       else
         break;
+    }
   }
   string->resize(string->length() - 1 - partial_enc_bytes);
 }
 
 }  // namespace browser_sync
-
diff --git a/third_party/libjingle/files/talk/base/cryptstring.h b/third_party/libjingle/files/talk/base/cryptstring.h
index 64a7e57..119483f 100644
--- a/third_party/libjingle/files/talk/base/cryptstring.h
+++ b/third_party/libjingle/files/talk/base/cryptstring.h
@@ -28,6 +28,7 @@
 #ifndef _TALK_BASE_CRYPTSTRING_H_
 #define _TALK_BASE_CRYPTSTRING_H_
 
+#include <string.h>
 #include <string>
 #include "talk/base/linked_ptr.h"
 #include "talk/base/scoped_ptr.h"
diff --git a/third_party/libjingle/files/talk/base/host.cc b/third_party/libjingle/files/talk/base/host.cc
index df5f7f7..e6fe648 100644
--- a/third_party/libjingle/files/talk/base/host.cc
+++ b/third_party/libjingle/files/talk/base/host.cc
@@ -28,6 +28,7 @@
 #include <string>
 #include <iostream>
 #include <cassert>
+#include <cstdlib>
 #include <errno.h>
 
 #ifdef POSIX
diff --git a/third_party/libjingle/files/talk/base/natserver.cc b/third_party/libjingle/files/talk/base/natserver.cc
index 336cf64..66696a1 100644
--- a/third_party/libjingle/files/talk/base/natserver.cc
+++ b/third_party/libjingle/files/talk/base/natserver.cc
@@ -26,6 +26,7 @@
  */
 
 #include <cassert>
+#include <cstring>
 #include <iostream>
 
 #ifdef POSIX
diff --git a/third_party/libjingle/files/talk/base/natsocketfactory.cc b/third_party/libjingle/files/talk/base/natsocketfactory.cc
index 2b0309e..59a0d87 100644
--- a/third_party/libjingle/files/talk/base/natsocketfactory.cc
+++ b/third_party/libjingle/files/talk/base/natsocketfactory.cc
@@ -27,6 +27,7 @@
 
 #include <iostream>
 #include <cassert>
+#include <cstring>
 #include "talk/base/natsocketfactory.h"
 
 namespace talk_base {
diff --git a/third_party/libjingle/files/talk/base/socketadapters.cc b/third_party/libjingle/files/talk/base/socketadapters.cc
index fcbc20b..0fe940ad 100644
--- a/third_party/libjingle/files/talk/base/socketadapters.cc
+++ b/third_party/libjingle/files/talk/base/socketadapters.cc
@@ -41,6 +41,8 @@
 #include <security.h>
 #endif
 
+#include <cstring>
+
 #include "talk/base/basicdefs.h"
 #include "talk/base/bytebuffer.h"
 #include "talk/base/common.h"
diff --git a/third_party/libjingle/files/talk/base/stringencode.cc b/third_party/libjingle/files/talk/base/stringencode.cc
index ed6edfc..3c3dae8 100644
--- a/third_party/libjingle/files/talk/base/stringencode.cc
+++ b/third_party/libjingle/files/talk/base/stringencode.cc
@@ -32,6 +32,7 @@
 #include <alloca.h>
 #define _alloca alloca
 #endif  // POSIX
+#include <stdlib.h>
 
 #include "talk/base/basictypes.h"
 #include "talk/base/common.h"
diff --git a/third_party/libjingle/files/talk/base/stringutils.h b/third_party/libjingle/files/talk/base/stringutils.h
index 8aa9b69..2ad071a 100644
--- a/third_party/libjingle/files/talk/base/stringutils.h
+++ b/third_party/libjingle/files/talk/base/stringutils.h
@@ -31,6 +31,7 @@
 #include <ctype.h>
 #include <stdarg.h>
 #include <stdio.h>
+#include <string.h>
 #ifdef WIN32
 #include <wchar.h>
 #endif  // WIN32
diff --git a/third_party/libjingle/files/talk/base/testclient.cc b/third_party/libjingle/files/talk/base/testclient.cc
index ecb45fc..c963782 100644
--- a/third_party/libjingle/files/talk/base/testclient.cc
+++ b/third_party/libjingle/files/talk/base/testclient.cc
@@ -27,6 +27,7 @@
 
 #include <iostream>
 #include <cassert>
+#include <cstring>
 
 #ifdef POSIX
 extern "C" {
diff --git a/third_party/libjingle/files/talk/base/urlencode.cc b/third_party/libjingle/files/talk/base/urlencode.cc
index b654c35..d80fbe1 100644
--- a/third_party/libjingle/files/talk/base/urlencode.cc
+++ b/third_party/libjingle/files/talk/base/urlencode.cc
@@ -1,3 +1,5 @@
+#include <stdlib.h>
+#include <string.h>
 #include "talk/base/urlencode.h"
 
 static int HexPairValue(const char * code) {
diff --git a/third_party/libjingle/files/talk/p2p/base/port.cc b/third_party/libjingle/files/talk/p2p/base/port.cc
index cc33d4c..2411e5f 100644
--- a/third_party/libjingle/files/talk/p2p/base/port.cc
+++ b/third_party/libjingle/files/talk/p2p/base/port.cc
@@ -32,6 +32,7 @@
 #include <errno.h>
 
 #include <algorithm>
+#include <cstring>
 #include <iostream>
 #include <vector>
 
diff --git a/third_party/libjingle/files/talk/p2p/base/relayport.cc b/third_party/libjingle/files/talk/p2p/base/relayport.cc
index a8a0527..c4b5066 100644
--- a/third_party/libjingle/files/talk/p2p/base/relayport.cc
+++ b/third_party/libjingle/files/talk/p2p/base/relayport.cc
@@ -34,6 +34,7 @@
 #include "talk/p2p/base/relayport.h"
 #include <iostream>
 #include <cassert>
+#include <cstring>
 #ifdef OSX
 #include <errno.h>
 #endif
diff --git a/third_party/libjingle/files/talk/p2p/base/stun.cc b/third_party/libjingle/files/talk/p2p/base/stun.cc
index c4a89e8..3d5ae66 100644
--- a/third_party/libjingle/files/talk/p2p/base/stun.cc
+++ b/third_party/libjingle/files/talk/p2p/base/stun.cc
@@ -29,6 +29,7 @@
 #include "talk/p2p/base/stun.h"
 #include <iostream>
 #include <cassert>
+#include <cstring>
 
 #if defined(_MSC_VER) && _MSC_VER < 1300
 namespace std {