From: Andy Fleming <afleming@freescale.com>
Date: Wed, 11 Jun 2008 23:10:20 +0000 (-0500)
Subject: Fix build issue with string.h and linux/string.h
X-Git-Tag: v1.3.4-rc1~98
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a94f22f08f280905926219e568568964cb9eeb9d;p=oweals%2Fu-boot.git

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>
---

diff --git a/lib_generic/md5.c b/lib_generic/md5.c
index a9aae4682f..9150510bbc 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 a192e5f3dd..da5bc16f3c 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"
 
 /*