From d318afb7d54cbcbef0750efa79314f43d5ab8d7b Mon Sep 17 00:00:00 2001
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Sun, 9 Oct 2005 21:37:45 +0200
Subject: [PATCH] --- yaml --- r: 9767 b: refs/heads/master c:
 028c0cc16e429ae24d9b8aacc64f4438bdfac0cc h: refs/heads/master i:   9765:
 433e4cbfb42b79ca03f1d6c00f9135604187dd9c   9763:
 1fbfc56bc85a5bfe0cc58e83da5204a5a5452515   9759:
 b68dd8cf8e99151fada131d72cc0acabfc9d8ba8 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/um/drivers/cow.h      | 27 ++++++++++++++++++++++++++-
 trunk/arch/um/drivers/cow_user.c |  1 -
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d5aef34170c2..f5c9bc802308 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 855ec613ca7e1953d96d7ea81af90392678788f5
+refs/heads/master: 028c0cc16e429ae24d9b8aacc64f4438bdfac0cc
diff --git a/trunk/arch/um/drivers/cow.h b/trunk/arch/um/drivers/cow.h
index 4fcbe8b1b77e..c54e20a3d21d 100644
--- a/trunk/arch/um/drivers/cow.h
+++ b/trunk/arch/um/drivers/cow.h
@@ -3,6 +3,26 @@
 
 #include <asm/types.h>
 
+#if defined(__KERNEL__)
+
+# include <asm/byteorder.h>
+
+# if defined(__BIG_ENDIAN)
+#	define ntohll(x) (x)
+#	define htonll(x) (x)
+# elif defined(__LITTLE_ENDIAN)
+#	define ntohll(x)  be64_to_cpu(x)
+#	define htonll(x)  cpu_to_be64(x)
+# else
+#	error "Could not determine byte order"
+# endif
+
+#else
+/* For the definition of ntohl, htonl and __BYTE_ORDER */
+#include <endian.h>
+#include <netinet/in.h>
+#if defined(__BYTE_ORDER)
+
 #if __BYTE_ORDER == __BIG_ENDIAN
 # define ntohll(x) (x)
 # define htonll(x) (x)
@@ -10,8 +30,13 @@
 # define ntohll(x)  bswap_64(x)
 # define htonll(x)  bswap_64(x)
 #else
-#error "__BYTE_ORDER not defined"
+# error "Could not determine byte order: __BYTE_ORDER uncorrectly defined"
+#endif
+
+#else  /* ! defined(__BYTE_ORDER) */
+#	error "Could not determine byte order: __BYTE_ORDER not defined"
 #endif
+#endif /* ! defined(__KERNEL__) */
 
 extern int init_cow_file(int fd, char *cow_file, char *backing_file,
 			 int sectorsize, int alignment, int *bitmap_offset_out,
diff --git a/trunk/arch/um/drivers/cow_user.c b/trunk/arch/um/drivers/cow_user.c
index a8ce6fc3ef26..fbe2217db5dd 100644
--- a/trunk/arch/um/drivers/cow_user.c
+++ b/trunk/arch/um/drivers/cow_user.c
@@ -9,7 +9,6 @@
 #include <sys/time.h>
 #include <sys/param.h>
 #include <sys/user.h>
-#include <netinet/in.h>
 
 #include "os.h"