Merge branch 'mimc200' into next

[oweals/u-boot.git] / include / libfdt_env.h

diff --git a/include/libfdt_env.h b/include/libfdt_env.h
index 355ebf27b2b6b9263c48a10d4ac1aab7d67814f0..ea474a56b1299e46f3948835fbcab1e2786c65ae 100644 (file)
--- 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 */