From a7859af5c73c3f7cc863702d322d86fc2c4523ab Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 22 Feb 2012 17:10:34 -0500
Subject: [PATCH] Revert "Add FreeBSD compat layer for endian.h"

This reverts commit 8740da0a30986094ebf03a0f3b7448844d5e886f.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@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, 4 insertions(+), 34 deletions(-)
 delete mode 100644 include/lttng/ust-endian.h

diff --git a/include/Makefile.am b/include/Makefile.am
index 66b9ab0a..e339b32e 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -13,7 +13,6 @@ 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 61cb1805..df8ab0b2 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 <lttng/ust-endian.h>	/* Non-standard BIG_ENDIAN, LITTLE_ENDIAN, BYTE_ORDER */
+#include <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
deleted file mode 100644
index 085ff072..00000000
--- a/include/lttng/ust-endian.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#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 2bbe785e..2f00440b 100644
--- a/include/lttng/ust-events.h
+++ b/include/lttng/ust-events.h
@@ -24,7 +24,7 @@
 #include <stdint.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-tracer.h>
-#include <lttng/ust-endian.h>
+#include <endian.h>
 #include <float.h>
 
 struct ltt_channel;
diff --git a/liblttng-ust/jhash.h b/liblttng-ust/jhash.h
index da1e7dd0..944dc047 100644
--- a/liblttng-ust/jhash.h
+++ b/liblttng-ust/jhash.h
@@ -17,7 +17,7 @@
  */
 
 #include <urcu/compiler.h>
-#include <lttng/ust-endian.h>
+#include <endian.h>
 
 /*
  * Hash function
diff --git a/liblttng-ust/ltt-events.c b/liblttng-ust/ltt-events.c
index e42b6de6..b67a15c6 100644
--- a/liblttng-ust/ltt-events.c
+++ b/liblttng-ust/ltt-events.c
@@ -10,6 +10,7 @@
 
 #define _GNU_SOURCE
 #include <stdio.h>
+#include <endian.h>
 #include <urcu/list.h>
 #include <urcu/hlist.h>
 #include <pthread.h>
@@ -22,7 +23,6 @@
 #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