From 3208818bfe394315cae502a14e01195713299aac Mon Sep 17 00:00:00 2001
From: Michael Jeanson <mjeanson@efficios.com>
Date: Tue, 13 Oct 2020 16:42:23 -0400
Subject: [PATCH] port: fix endian and byteswap compat on FreeBSD

Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Change-Id: I8edd89df2c99406b10b846eb1a8bcf959e8bbde4
---
 include/lttng/ust-elf.h                 | 1 -
 include/lttng/ust-endian.h              | 6 +++++-
 include/lttng/ust-tracepoint-event.h    | 2 +-
 liblttng-ust-ctl/ustctl.c               | 2 +-
 liblttng-ust/lttng-filter-interpreter.c | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/include/lttng/ust-elf.h b/include/lttng/ust-elf.h
index c4abee2d..49edc6f9 100644
--- a/include/lttng/ust-elf.h
+++ b/include/lttng/ust-elf.h
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdio.h>
-#include <byteswap.h>
 #include <elf.h>
 #include <lttng/ust-endian.h>
 
diff --git a/include/lttng/ust-endian.h b/include/lttng/ust-endian.h
index a512b02b..763a447e 100644
--- a/include/lttng/ust-endian.h
+++ b/include/lttng/ust-endian.h
@@ -29,8 +29,12 @@
 
 #if (defined(__linux__) || defined(__CYGWIN__))
 #include <endian.h>
+#include <byteswap.h>
 #elif defined(__FreeBSD__)
-#include <machine/endian.h>
+#include <sys/endian.h>
+#define bswap_16(x)	bswap16(x)
+#define bswap_32(x)	bswap32(x)
+#define bswap_64(x)	bswap64(x)
 #else
 #error "Please add support for your OS."
 #endif
diff --git a/include/lttng/ust-tracepoint-event.h b/include/lttng/ust-tracepoint-event.h
index ec0e3144..622befe0 100644
--- a/include/lttng/ust-tracepoint-event.h
+++ b/include/lttng/ust-tracepoint-event.h
@@ -29,7 +29,7 @@
 #include <lttng/ringbuffer-config.h>
 #include <lttng/ust-compiler.h>
 #include <lttng/tracepoint.h>
-#include <byteswap.h>
+#include <lttng/ust-endian.h>
 #include <string.h>
 
 #define __LTTNG_UST_NULL_STRING	"(null)"
diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 69bbd21a..a7eca3b0 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -17,7 +17,6 @@
  */
 
 #define _GNU_SOURCE
-#include <byteswap.h>
 #include <stdint.h>
 #include <string.h>
 #include <sys/mman.h>
@@ -27,6 +26,7 @@
 #include <lttng/ust-ctl.h>
 #include <lttng/ust-abi.h>
 #include <lttng/ust-events.h>
+#include <lttng/ust-endian.h>
 #include <usterr-signal-safe.h>
 #include <ust-comm.h>
 #include <helper.h>
diff --git a/liblttng-ust/lttng-filter-interpreter.c b/liblttng-ust/lttng-filter-interpreter.c
index 5255bb73..6c42b20f 100644
--- a/liblttng-ust/lttng-filter-interpreter.c
+++ b/liblttng-ust/lttng-filter-interpreter.c
@@ -28,7 +28,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <urcu-pointer.h>
-#include <byteswap.h>
+#include <lttng/ust-endian.h>
 #include "lttng-filter.h"
 #include "string-utils.h"
 
-- 
2.34.1