commit 066a3862a38957fdcd5f20caa63c7931e9a0f433
author Greg Hackmann <ghackmann@google.com> Tue Dec 17 16:23:32 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Dec 17 16:23:32 2013 -0800
tree cdb9bc49d5e7e8166c61204bfedc8fa6e425855e
parent d38ca369c07744abeb5477c6a524a683fb9a4927
parent 83a766373f4ee2036fe3824623b7881156fd2ee8

am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"

* commit '83a766373f4ee2036fe3824623b7881156fd2ee8':
  toolbox: uptime: fix unused parameter warnings

toolbox/uptime.c

diff --git a/toolbox/uptime.c b/toolbox/uptime.c
index 1c312b0..455e7be 100644
--- a/toolbox/uptime.c
+++ b/toolbox/uptime.c
@@ -71,7 +71,8 @@
     return -1;
 }
 
-int uptime_main(int argc, char *argv[])
+int uptime_main(int argc __attribute__((unused)),
+        char *argv[] __attribute__((unused)))
 {
     float up_time, idle_time;
     char up_string[100], idle_string[100], sleep_string[100];