From 9e3c23dc3eaa7f05c909c4741bd8e3b49b8a5508 Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Mon, 20 Feb 2012 19:15:25 -0500
Subject: [PATCH] Add FreeBSD compat layer for endian.h

commit 2ae577586ce440e59acd37c0110b80a595a64d12 upstream.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Christian Babeux <christian.babeux@efficios.com>
---
 include/Makefile.am        |  1 +
 include/lttng/bitfield.h   |  2 +-
 include/lttng/ust-endian.h | 29 +++++++++++++++++++++++++++++
 include/lttng/ust-events.h |  2 +-
 liblttng-ust/jhash.h       |  2 +-
 liblttng-ust/ltt-events.c  |  2 +-
 6 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 include/lttng/ust-endian.h

diff --git a/include/Makefile.am b/include/Makefile.am
index e339b32e..66b9ab0a 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -13,6 +13,7 @@ nobase_include_HEADERS = \
 	lttng/ust-tracer.h \
 	lttng/ust-config.h \
 	lttng/ust.h \
+	lttng/ust-endian.h \
 	lttng/ringbuffer-config.h \
 	lttng/align.h \
 	lttng/bug.h
diff --git a/include/lttng/bitfield.h b/include/lttng/bitfield.h
index 9bef7e3c..c3f2d1ac 100644
--- a/include/lttng/bitfield.h
+++ b/include/lttng/bitfield.h
@@ -21,7 +21,7 @@
 
 #include <stdint.h>	/* C99 5.2.4.2 Numerical limits */
 #include <limits.h>	/* C99 5.2.4.2 Numerical limits */
-#include <endian.h>	/* Non-standard BIG_ENDIAN, LITTLE_ENDIAN, BYTE_ORDER */
+#include <lttng/ust-endian.h>	/* Non-standard BIG_ENDIAN, LITTLE_ENDIAN, BYTE_ORDER */
 #include <assert.h>
 
 /* We can't shift a int from 32 bit, >> 32 and << 32 on int is undefined */
diff --git a/include/lttng/ust-endian.h b/include/lttng/ust-endian.h
new file mode 100644
index 00000000..085ff072
--- /dev/null
+++ b/include/lttng/ust-endian.h
@@ -0,0 +1,29 @@
+#ifndef _LTTNG_UST_ENDIAN_H
+#define _LTTNG_UST_ENDIAN_H
+
+/*
+ * lttng/ust-endian.h
+ *
+ * Copyright 2012 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * endian.h compatibility layer.
+ *
+ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
+ * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
+ *
+ * Permission is hereby granted to use or copy this program
+ * for any purpose,  provided the above notices are retained on all copies.
+ * Permission to modify the code and to distribute modified code is granted,
+ * provided the above notices are retained, and a notice that the code was
+ * modified is included with the above copyright notice.
+ */
+
+#ifdef __linux__
+#include <endian.h>
+#elif __FreeBSD__
+#include <machine/endian.h>
+#else
+#error "Please add support for your OS into lttng/ust-endian.h."
+#endif
+
+#endif /* _LTTNG_UST_ENDIAN_H */
diff --git a/include/lttng/ust-events.h b/include/lttng/ust-events.h
index bf00f062..251c0fb6 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-tracer.h>
-#include <endian.h>
+#include <lttng/ust-endian.h>
 #include <float.h>
 
 struct ltt_channel;
diff --git a/liblttng-ust/jhash.h b/liblttng-ust/jhash.h
index 944dc047..da1e7dd0 100644
--- a/liblttng-ust/jhash.h
+++ b/liblttng-ust/jhash.h
@@ -17,7 +17,7 @@
  */
 
 #include <urcu/compiler.h>
-#include <endian.h>
+#include <lttng/ust-endian.h>
 
 /*
  * Hash function
diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index d2c922b6..775e73ca 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -22,7 +22,6 @@
 
 #define _GNU_SOURCE
 #include <stdio.h>
-#include <endian.h>
 #include <urcu/list.h>
 #include <urcu/hlist.h>
 #include <pthread.h>
@@ -35,6 +34,7 @@
 #include <inttypes.h>
 #include <time.h>
 #include <sys/prctl.h>
+#include <lttng/ust-endian.h>
 #include "clock.h"
 
 #include <urcu-bp.h>
-- 
2.34.1