From: David Carlier <devnexen@gmail.com>
Date: Fri, 21 May 2021 19:36:21 +0000 (+0100)
Subject: OpenBSD build fix proposal
X-Git-Tag: 2.0.4~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8b5630050aa541c2e49632bf2dc69b70f4120f5d;p=thirdparty%2Fzlib-ng.git

OpenBSD build fix proposal
---

diff --git a/zutil.h b/zutil.h
index 497cb22b4..11e487576 100644
--- a/zutil.h
+++ b/zutil.h
@@ -183,12 +183,16 @@ void Z_INTERNAL   zng_cfree(void *opaque, void *ptr);
 #  define ZSWAP32(q) bswap_32(q)
 #  define ZSWAP64(q) bswap_64(q)
 
-#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
+#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
 #  include <sys/endian.h>
 #  define ZSWAP16(q) bswap16(q)
 #  define ZSWAP32(q) bswap32(q)
 #  define ZSWAP64(q) bswap64(q)
-
+#elif defined(__OpenBSD__)
+#  include <sys/endian.h>
+#  define ZSWAP16(q) swap16(q)
+#  define ZSWAP32(q) swap32(q)
+#  define ZSWAP64(q) swap64(q)
 #elif defined(__INTEL_COMPILER)
 /* ICC does not provide a two byte swap. */
 #  define ZSWAP16(q) ((((q) & 0xff) << 8) | (((q) & 0xff00) >> 8))
diff --git a/zutil_p.h b/zutil_p.h
index f3830f35f..c8122607e 100644
--- a/zutil_p.h
+++ b/zutil_p.h
@@ -5,7 +5,7 @@
 #ifndef ZUTIL_P_H
 #define ZUTIL_P_H
 
-#ifdef __APPLE__
+#if defined(__APPLE__) || defined(__OpenBSD__)
 #  include <stdlib.h>
 #elif defined(__FreeBSD__)
 #  include <stdlib.h>
@@ -16,7 +16,7 @@
 
 /* Function to allocate 16 or 64-byte aligned memory */
 static inline void *zng_alloc(size_t size) {
-#if defined(__FreeBSD__) || defined(__NetBSD__)
+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
     void *ptr;
     return posix_memalign(&ptr, 64, size) ? NULL : ptr;
 #elif defined(_WIN32)