summaryrefslogtreecommitdiffstats
path: root/toolbox
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2013-12-18 00:26:07 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-18 00:26:07 +0000
commit70f22d6b7620b5a3a11ef1d8136a4d10efe14670 (patch)
tree34c36c9cb4aa5ce161d0347d256a4e6e0127f724 /toolbox
parent7510fa3e71e3d42065de44ccf3e0fa50606ecf05 (diff)
parent066a3862a38957fdcd5f20caa63c7931e9a0f433 (diff)
downloadsystem_core-70f22d6b7620b5a3a11ef1d8136a4d10efe14670.zip
system_core-70f22d6b7620b5a3a11ef1d8136a4d10efe14670.tar.gz
system_core-70f22d6b7620b5a3a11ef1d8136a4d10efe14670.tar.bz2
am 066a3862: am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"
* commit '066a3862a38957fdcd5f20caa63c7931e9a0f433': toolbox: uptime: fix unused parameter warnings
Diffstat (limited to 'toolbox')
-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];