From 4b48964f001cfcdbd75c67afa3dd7a13a7e885e6 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Sun, 12 Jun 2022 21:11:20 +0300
Subject: [PATCH 1/2] Merge pull request #2 from tchepavel/patch-1

FreeBSD compatibility

(cherry picked from commit 6a9e7df5fd3a4f05d41274900f0828671c42b516)
---
 src/include/n-unix.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/include/n-unix.h b/src/include/n-unix.h
index ac4919a25..6805c0af9 100644
--- a/src/include/n-unix.h
+++ b/src/include/n-unix.h
@@ -18,7 +18,7 @@
 #define _GNU_SOURCE
 #endif
 
-#if defined(__arm__) || defined(__aarch64__)
+#if defined(__arm__) || defined(__aarch64__) || defined(__FreeBSD__)
 #include <sys/socket.h>
 #endif
 

From cf36537e257e45b8c9a74426855d80504ace66a4 Mon Sep 17 00:00:00 2001
From: Ivan Blinkov <github@blinkov.ru>
Date: Mon, 1 Aug 2022 17:56:52 +0200
Subject: [PATCH 2/2] Merge pull request #3 from tavplubix/fix_build_clang_15

Fix build with clang-15

(cherry picked from commit eeb4cff4b7951ae3c9bd46c25c34142f8b219089)
---
 src/include/n-unix.h | 1 +
 src/js.c             | 1 +
 src/kv.c             | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/include/n-unix.h b/src/include/n-unix.h
index 6805c0af9..5a0f1e167 100644
--- a/src/include/n-unix.h
+++ b/src/include/n-unix.h
@@ -24,6 +24,7 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include <stdio.h>
 
 #include <sys/time.h>
 #include <fcntl.h>
diff --git a/src/js.c b/src/js.c
index 7e798f153..d2ea095dc 100644
--- a/src/js.c
+++ b/src/js.c
@@ -11,6 +11,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "natsp.h"
 #include <ctype.h>
 #include <limits.h>
 
diff --git a/src/kv.c b/src/kv.c
index 27146d704..05078f0a7 100644
--- a/src/kv.c
+++ b/src/kv.c
@@ -11,9 +11,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#include "natsp.h"
 #include <ctype.h>
 
-#include "natsp.h"
 #include "kv.h"
 #include "mem.h"
 #include "util.h"