[git commit master] compat and warning fixes

Denys Vlasenko vda.linux at googlemail.com
Mon Feb 8 23:26:10 UTC 2010


commit: http://git.busybox.net/busybox/commit/?id=10544a841002a9b4075ee267effcd330a0c705ca
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 coreutils/fsync.c    |    3 +++
 miscutils/fbsplash.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/coreutils/fsync.c b/coreutils/fsync.c
index f00803c..53900f8 100644
--- a/coreutils/fsync.c
+++ b/coreutils/fsync.c
@@ -7,6 +7,9 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 #include "libbb.h"
+#ifndef O_NOATIME
+# define O_NOATIME 0
+#endif
 
 /* This is a NOFORK applet. Be very careful! */
 
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 4560bb2..3bf16ab 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -301,7 +301,7 @@ static void fb_drawimage(void)
  */
 static void init(const char *cfg_filename)
 {
-	static const char const param_names[] ALIGN1 =
+	static const char param_names[] ALIGN1 =
 		"BAR_WIDTH\0" "BAR_HEIGHT\0"
 		"BAR_LEFT\0" "BAR_TOP\0"
 		"BAR_R\0" "BAR_G\0" "BAR_B\0"
-- 
1.6.3.3



More information about the busybox-cvs mailing list