summaryrefslogtreecommitdiffstats
path: root/toolbox
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2013-12-18 00:31:31 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-12-18 00:31:31 +0000
commit3fd9ca979a56eb09d5ddf3a7e912694a38d1dbcc (patch)
treef71ecd025a789d74e2821b88f550819ca9a125d1 /toolbox
parent0c5f9c04b8b5349575288e201dee997c079b7851 (diff)
parente75af5745440eb70d1f5682168edb84eaa631982 (diff)
downloadsystem_core-3fd9ca979a56eb09d5ddf3a7e912694a38d1dbcc.zip
system_core-3fd9ca979a56eb09d5ddf3a7e912694a38d1dbcc.tar.gz
system_core-3fd9ca979a56eb09d5ddf3a7e912694a38d1dbcc.tar.bz2
am e75af574: am 70f22d6b: am 066a3862: am 83a76637: Merge "toolbox: uptime: fix unused parameter warnings"
* commit 'e75af5745440eb70d1f5682168edb84eaa631982': 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];