summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDirk Hörner <dirker@gmail.com>2012-06-04 22:40:17 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-06-05 21:40:15 +0200
commita906e5e196551e1c232bb2d28413e918cf8889f1 (patch)
treef570a379232341ea20cec6c01c4f8b8c2136c2e8
parentf324a85e8b9ed5efb6c135a2c76df2347300f100 (diff)
downloadbarebox-a906e5e196551e1c232bb2d28413e918cf8889f1.tar.gz
barebox-a906e5e196551e1c232bb2d28413e918cf8889f1.tar.xz
hostcc tools: include "compiler.h", fix included headers
When barebox headers get included from HOSTCC tools they should not include other architecture specific headers as barebox might get cross-compiled. Instead, the tool itself should include "compiler.h". Signed-off-by: Dirk Hörner <dirker@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--include/envfs.h2
-rw-r--r--include/image.h2
-rw-r--r--scripts/bareboxenv.c2
3 files changed, 5 insertions, 1 deletions
diff --git a/include/envfs.h b/include/envfs.h
index b5849d9b8..67b890222 100644
--- a/include/envfs.h
+++ b/include/envfs.h
@@ -1,7 +1,9 @@
#ifndef _ENVFS_H
#define _ENVFS_H
+#ifdef __BAREBOX__
#include <asm/byteorder.h>
+#endif
#define ENVFS_MAGIC 0x798fba79 /* some random number */
#define ENVFS_INODE_MAGIC 0x67a8c78d
diff --git a/include/image.h b/include/image.h
index 35ff01b1c..027b5f252 100644
--- a/include/image.h
+++ b/include/image.h
@@ -31,8 +31,8 @@
#ifndef __IMAGE_H__
#define __IMAGE_H__
-#include <linux/types.h>
#ifdef __BAREBOX__
+#include <linux/types.h>
#include <asm/byteorder.h>
#include <stdio.h>
#include <string.h>
diff --git a/scripts/bareboxenv.c b/scripts/bareboxenv.c
index b0d5818ba..866e345b9 100644
--- a/scripts/bareboxenv.c
+++ b/scripts/bareboxenv.c
@@ -34,6 +34,8 @@
#include <getopt.h>
#include <libgen.h>
+#include "compiler.h"
+
#define debug(...)
void *xmalloc(size_t size)