From: Jerry Van Baren <gvb.uboot@gmail.com>
Date: Mon, 24 Nov 2008 13:15:02 +0000 (-0500)
Subject: libfdt: Fix redefined uintptr_t warning for USE_HOSTCC
X-Git-Tag: v2009.01-rc1~13
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=97a24a78ee6f34b89b821cb70eda1cf34aa11d97;p=u-boot

libfdt: Fix redefined uintptr_t warning for USE_HOSTCC

Compiling U-Boot in an old OS environment (RedHat-7.3  :-)  gives the
following warnings from FDT:

include/libfdt_env.h:50: warning: redefinition of 'uintptr_t'
/usr/include/stdint.h:129: warning: 'uintptr_t' previously declared here

Fix: Protect the definition of uintptr_t when compiling on the host
system.

Signed-off-by: Gerald Van Baren <vanbaren@cideas.com>
---

diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 355ebf27b2..ea474a56b1 100644
--- a/include/libfdt_env.h
+++ b/include/libfdt_env.h
@@ -47,6 +47,7 @@ extern struct fdt_header *working_fdt;  /* Pointer to the working fdt */
 #define cpu_to_fdt64(x)		(x)
 #endif
 
+#ifndef USE_HOSTCC
 /*
  * Types for `void *' pointers.
  *
@@ -58,5 +59,6 @@ typedef unsigned long int       uintptr_t;
 #else
 typedef unsigned int            uintptr_t;
 #endif
+#endif /* not USE_HOSTCC */
 
 #endif /* _LIBFDT_ENV_H */