From 4fa35d8ae80c175425e9525831d7b6a71a3ada60 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Tue, 11 Dec 2012 16:14:54 -0800
Subject: [PATCH] Fix <endian.h> and <sys/endian.h>.

Previously we'd been relying on getting the machine-specific <endian.h>
instead of the top-level <endian.h>, and <sys/endian.h> was basically broken.
Now, with this patch and the previous patch we should have <endian.h>
and <sys/endian.h> behaving the same. This is basically how NetBSD's endian.h
works, and was probably how ours was originally intended to work.

Bug: http://code.google.com/p/android/issues/detail?id=39824
Change-Id: I71de5a507e633de166013a658b5764df9e1aa09c
---
 libc/arch-arm/include/{ => machine}/endian.h  | 0
 libc/arch-mips/include/{ => machine}/endian.h | 0
 libc/arch-x86/include/{ => machine}/endian.h  | 0
 libc/include/sys/endian.h                     | 1 +
 4 files changed, 1 insertion(+)
 rename libc/arch-arm/include/{ => machine}/endian.h (100%)
 rename libc/arch-mips/include/{ => machine}/endian.h (100%)
 rename libc/arch-x86/include/{ => machine}/endian.h (100%)

diff --git a/libc/arch-arm/include/endian.h b/libc/arch-arm/include/machine/endian.h
similarity index 100%
rename from libc/arch-arm/include/endian.h
rename to libc/arch-arm/include/machine/endian.h
diff --git a/libc/arch-mips/include/endian.h b/libc/arch-mips/include/machine/endian.h
similarity index 100%
rename from libc/arch-mips/include/endian.h
rename to libc/arch-mips/include/machine/endian.h
diff --git a/libc/arch-x86/include/endian.h b/libc/arch-x86/include/machine/endian.h
similarity index 100%
rename from libc/arch-x86/include/endian.h
rename to libc/arch-x86/include/machine/endian.h
diff --git a/libc/include/sys/endian.h b/libc/include/sys/endian.h
index 00f48391e..2a0c65870 100644
--- a/libc/include/sys/endian.h
+++ b/libc/include/sys/endian.h
@@ -37,6 +37,7 @@
 #define _SYS_ENDIAN_H_
 
 #include <sys/cdefs.h>
+#include <machine/endian.h>
 #include <machine/_types.h>
 
 #define _LITTLE_ENDIAN	1234