summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Fleming <afleming@freescale.com>2008-06-11 18:10:20 -0500
committerWolfgang Denk <wd@denx.de>2008-06-12 08:51:35 +0200
commita94f22f08f280905926219e568568964cb9eeb9d (patch)
tree2006a21858c69a983d62fb0a0d0b860d70ab988b
parent9973e3c614721bbf169882ffc3be266a6611cd60 (diff)
downloadu-boot-imx-a94f22f08f280905926219e568568964cb9eeb9d.zip
u-boot-imx-a94f22f08f280905926219e568568964cb9eeb9d.tar.gz
u-boot-imx-a94f22f08f280905926219e568568964cb9eeb9d.tar.bz2
Fix build issue with string.h and linux/string.h
This commit: commit 338cc038461a6c7709c5b86fd9a240209338a1ae Author: Wolfgang Denk <wd@denx.de> Date: Fri Jun 6 14:28:14 2008 +0200 tools/mkimage: fix compiler warnings on some systems. Broke building on some systems, because the host's string.h was interfering with u-boot's linux/string.h. It doesn't look like we need the u-boot one if we're building for the host, so now we only include when building inside u-boot. Signed-off-by: Andy Fleming <afleming@freescale.com>
-rw-r--r--lib_generic/md5.c2
-rw-r--r--lib_generic/sha1.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib_generic/md5.c b/lib_generic/md5.c
index a9aae46..9150510 100644
--- a/lib_generic/md5.c
+++ b/lib_generic/md5.c
@@ -27,12 +27,12 @@
#ifndef USE_HOSTCC
#include <common.h>
+#include <linux/string.h>
#else
#include <string.h>
#endif /* USE_HOSTCC */
#include <watchdog.h>
#include <linux/types.h>
-#include <linux/string.h>
#include <u-boot/md5.h>
static void
diff --git a/lib_generic/sha1.c b/lib_generic/sha1.c
index a192e5f..da5bc16 100644
--- a/lib_generic/sha1.c
+++ b/lib_generic/sha1.c
@@ -31,11 +31,11 @@
#ifndef USE_HOSTCC
#include <common.h>
+#include <linux/string.h>
#else
#include <string.h>
#endif /* USE_HOSTCC */
#include <watchdog.h>
-#include <linux/string.h>
#include "sha1.h"
/*