commit 8e30d93a0a697af5aa9f417289c3e51e2aad84ce
author Elliott Hughes <enh@google.com> Wed Apr 29 19:49:41 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Apr 29 19:49:41 2015 +0000
tree 411636275007d1fa281cf035e44fa59f3d38e12a
parent b81743fab8b65c0b0f532fbf48c1d6448b401485
parent 1e9e25447c87e14ba49ea190fe0cadaec3b0d649

am ffa0d24d: Merge "Fix Win32 build."

* commit 'ffa0d24d09f22d81b8e47f7a27a7aec5f421a023':
  Fix Win32 build.

adb/adb_client.cpp

diff --git a/adb/adb_client.cpp b/adb/adb_client.cpp
index e07c92c..0b2d038 100644
--- a/adb/adb_client.cpp
+++ b/adb/adb_client.cpp
@@ -191,7 +191,7 @@
     D("_adb_connect: %s\n", service);
     size_t len = strlen(service);
     if ((len < 1) || (len > 1024)) {
-        *error = android::base::StringPrintf("service name too long (%zd)", len);
+        *error = android::base::StringPrintf("service name too long (%d)", static_cast<int>(len));
         return -1;
     }
     snprintf(tmp, sizeof tmp, "%04zx", len);