summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorDenys Vlasenko2009-09-06 12:47:55 +0200
committerDenys Vlasenko2009-09-06 12:47:55 +0200
commit043b1e5d997d9b582a5aee37bd56e2e4f29be6e4 (patch)
treebab07bc427f178857896a8bf252c61ea1a5c67a2 /util-linux
parent5370bfb123266ab5716f321e43d3f8f6da7d7143 (diff)
downloadbusybox-043b1e5d997d9b582a5aee37bd56e2e4f29be6e4.zip
busybox-043b1e5d997d9b582a5aee37bd56e2e4f29be6e4.tar.gz
more C standard compat fixes from Dan Fandrich
function old new delta docolon 207 204 -3 Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/hexdump.c2
-rw-r--r--util-linux/hwclock.c8
2 files changed, 7 insertions, 3 deletions
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 98d1ac2..f3878f4 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -47,7 +47,7 @@ static const struct suffix_mult suffixes[] = {
{ "b", 512 },
{ "k", 1024 },
{ "m", 1024*1024 },
- { }
+ { "", 0 }
};
int hexdump_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 2cdb186..6dff57f 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -7,8 +7,9 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
-#include <sys/utsname.h>
#include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
+#include <sys/utsname.h>
#include "rtc_.h"
#if ENABLE_FEATURE_HWCLOCK_LONG_OPTIONS
@@ -67,7 +68,10 @@ static void show_clock(int utc)
static void to_sys_clock(int utc)
{
struct timeval tv;
- const struct timezone tz = { timezone/60 - 60*daylight, 0 };
+ struct timezone tz;
+
+ tz.tz_minuteswest = timezone/60 - 60*daylight;
+ tz.tz_dsttime = 0;
tv.tv_sec = read_rtc(utc);
tv.tv_usec = 0;