From eff8b06effbe41fa4881f724ef73e70ef5eebb40 Mon Sep 17 00:00:00 2001
From: Michael Brown <mcb30@etherboot.org>
Date: Fri, 17 Aug 2007 19:51:08 +0100
Subject: [PATCH] Separate out arch-independent parts of stdint.h

---
 src/arch/i386/include/{ => bits}/stdint.h | 24 +++--------------------
 src/include/stdint.h                      | 24 +++++++++++++++++++++++
 2 files changed, 27 insertions(+), 21 deletions(-)
 rename src/arch/i386/include/{ => bits}/stdint.h (50%)
 create mode 100644 src/include/stdint.h

diff --git a/src/arch/i386/include/stdint.h b/src/arch/i386/include/bits/stdint.h
similarity index 50%
rename from src/arch/i386/include/stdint.h
rename to src/arch/i386/include/bits/stdint.h
index 34bea8b4..a2947cda 100644
--- a/src/arch/i386/include/stdint.h
+++ b/src/arch/i386/include/bits/stdint.h
@@ -1,5 +1,5 @@
-#ifndef STDINT_H
-#define STDINT_H
+#ifndef _BITS_STDINT_H
+#define _BITS_STDINT_H
 
 typedef typeof(sizeof(int))	size_t;
 typedef signed long		ssize_t;
@@ -18,22 +18,4 @@ typedef signed long long	int64_t;
 typedef unsigned long		physaddr_t;
 typedef unsigned long		intptr_t;
 
-typedef int8_t s8;
-typedef uint8_t u8;
-typedef int16_t s16;
-typedef uint16_t u16;
-typedef int32_t s32;
-typedef uint32_t u32;
-typedef int64_t s64;
-typedef uint64_t u64;
-
-typedef int8_t int8;
-typedef uint8_t uint8;
-typedef int16_t int16;
-typedef uint16_t uint16;
-typedef int32_t int32;
-typedef uint32_t uint32;
-typedef int64_t int64;
-typedef uint64_t uint64;
-
-#endif /* STDINT_H */
+#endif /* _BITS_STDINT_H */
diff --git a/src/include/stdint.h b/src/include/stdint.h
new file mode 100644
index 00000000..4b0e44f2
--- /dev/null
+++ b/src/include/stdint.h
@@ -0,0 +1,24 @@
+#ifndef _STDINT_H
+#define _STDINT_H
+
+#include <bits/stdint.h>
+
+typedef int8_t s8;
+typedef uint8_t u8;
+typedef int16_t s16;
+typedef uint16_t u16;
+typedef int32_t s32;
+typedef uint32_t u32;
+typedef int64_t s64;
+typedef uint64_t u64;
+
+typedef int8_t int8;
+typedef uint8_t uint8;
+typedef int16_t int16;
+typedef uint16_t uint16;
+typedef int32_t int32;
+typedef uint32_t uint32;
+typedef int64_t int64;
+typedef uint64_t uint64;
+
+#endif /* _STDINT_H */