summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2013-12-18 00:28:47 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-18 00:28:47 +0000
commite75af5745440eb70d1f5682168edb84eaa631982 (patch)
treecdb9bc49d5e7e8166c61204bfedc8fa6e425855e
parent0f7c043ba89de91cb9531645893f3cb79e15ced5 (diff)
parent70f22d6b7620b5a3a11ef1d8136a4d10efe14670 (diff)
downloadsystem_core-e75af5745440eb70d1f5682168edb84eaa631982.zip
system_core-e75af5745440eb70d1f5682168edb84eaa631982.tar.gz
system_core-e75af5745440eb70d1f5682168edb84eaa631982.tar.bz2
am 70f22d6b: am 066a3862: am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"
* commit '70f22d6b7620b5a3a11ef1d8136a4d10efe14670': toolbox: uptime: fix unused parameter warnings
-rw-r--r--toolbox/uptime.c3
1 files changed, 2 insertions, 1 deletions
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 @@ int64_t elapsedRealtime()
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];