From 1d97df404863c7cb4e23224da735e314cb367f98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jerry=20Lundstr=C3=B6m?= <lundstrom.jerry@gmail.com>
Date: Fri, 22 Jun 2018 14:17:15 +0200
Subject: [PATCH] .

---
 src/core/object/dns.c | 13 +++++++++++--
 src/filter/layer.c    | 13 +++++++++++--
 src/input/fpcap.c     | 13 +++++++++++--
 src/input/mmpcap.c    | 13 +++++++++++--
 4 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/src/core/object/dns.c b/src/core/object/dns.c
index 747262c1..6c1996a2 100644
--- a/src/core/object/dns.c
+++ b/src/core/object/dns.c
@@ -28,20 +28,29 @@
 #include <string.h>
 #ifdef HAVE_ENDIAN_H
 #include <endian.h>
-#endif
+#else
 #ifdef HAVE_SYS_ENDIAN_H
 #include <sys/endian.h>
-#endif
+#else
 #ifdef HAVE_MACHINE_ENDIAN_H
 #include <machine/endian.h>
 #endif
+#endif
+#endif
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
+#endif
+#ifndef bswap_16
+#ifndef bswap16
+#define bswap_16(x) swap16(x)
+#define bswap_32(x) swap32(x)
+#define bswap_64(x) swap64(x)
 #else
 #define bswap_16(x) bswap16(x)
 #define bswap_32(x) bswap32(x)
 #define bswap_64(x) bswap64(x)
 #endif
+#endif
 
 #define _ERR_MALFORMED -2
 #define _ERR_NEEDLABELS -3
diff --git a/src/filter/layer.c b/src/filter/layer.c
index 0533c073..fb0341ca 100644
--- a/src/filter/layer.c
+++ b/src/filter/layer.c
@@ -38,20 +38,29 @@
 #endif
 #ifdef HAVE_ENDIAN_H
 #include <endian.h>
-#endif
+#else
 #ifdef HAVE_SYS_ENDIAN_H
 #include <sys/endian.h>
-#endif
+#else
 #ifdef HAVE_MACHINE_ENDIAN_H
 #include <machine/endian.h>
 #endif
+#endif
+#endif
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
+#endif
+#ifndef bswap_16
+#ifndef bswap16
+#define bswap_16(x) swap16(x)
+#define bswap_32(x) swap32(x)
+#define bswap_64(x) swap64(x)
 #else
 #define bswap_16(x) bswap16(x)
 #define bswap_32(x) bswap32(x)
 #define bswap_64(x) bswap64(x)
 #endif
+#endif
 
 #define N_IEEE802 3
 
diff --git a/src/input/fpcap.c b/src/input/fpcap.c
index 843383d3..dadc7aa1 100644
--- a/src/input/fpcap.c
+++ b/src/input/fpcap.c
@@ -27,20 +27,29 @@
 #include <stdio.h>
 #ifdef HAVE_ENDIAN_H
 #include <endian.h>
-#endif
+#else
 #ifdef HAVE_SYS_ENDIAN_H
 #include <sys/endian.h>
-#endif
+#else
 #ifdef HAVE_MACHINE_ENDIAN_H
 #include <machine/endian.h>
 #endif
+#endif
+#endif
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
+#endif
+#ifndef bswap_16
+#ifndef bswap16
+#define bswap_16(x) swap16(x)
+#define bswap_32(x) swap32(x)
+#define bswap_64(x) swap64(x)
 #else
 #define bswap_16(x) bswap16(x)
 #define bswap_32(x) bswap32(x)
 #define bswap_64(x) bswap64(x)
 #endif
+#endif
 
 #define MAX_SNAPLEN 0x40000
 
diff --git a/src/input/mmpcap.c b/src/input/mmpcap.c
index 571479cd..f5a93fd4 100644
--- a/src/input/mmpcap.c
+++ b/src/input/mmpcap.c
@@ -32,20 +32,29 @@
 #include <string.h>
 #ifdef HAVE_ENDIAN_H
 #include <endian.h>
-#endif
+#else
 #ifdef HAVE_SYS_ENDIAN_H
 #include <sys/endian.h>
-#endif
+#else
 #ifdef HAVE_MACHINE_ENDIAN_H
 #include <machine/endian.h>
 #endif
+#endif
+#endif
 #ifdef HAVE_BYTESWAP_H
 #include <byteswap.h>
+#endif
+#ifndef bswap_16
+#ifndef bswap16
+#define bswap_16(x) swap16(x)
+#define bswap_32(x) swap32(x)
+#define bswap_64(x) swap64(x)
 #else
 #define bswap_16(x) bswap16(x)
 #define bswap_32(x) bswap32(x)
 #define bswap_64(x) bswap64(x)
 #endif
+#endif
 
 static core_log_t     _log      = LOG_T_INIT("input.mmpcap");
 static input_mmpcap_t _defaults = {