From aa488b8225d86cdc2cda9fec81cfe8955e19f258 Mon Sep 17 00:00:00 2001
From: Thomas von Dein <tom@vondein.org>
Date: Mon, 1 Dec 2025 15:10:38 +0100
Subject: [PATCH] fix location of fcntl.h

---
 net.h   | 48 +++++++++++++++++++++++++-----------------------
 udpxd.h |  2 +-
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/net.h b/net.h
index 6a7d615..978e4ad 100644
--- a/net.h
+++ b/net.h
@@ -22,25 +22,24 @@
 #ifndef _HAVE_NET_H
 #define _HAVE_NET_H
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <unistd.h>
-#include <time.h>
-#include <signal.h>
 #include <setjmp.h>
+#include <signal.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <syslog.h>
+#include <time.h>
+#include <unistd.h>
 
-#include <sys/stat.h>
-#include <sys/socket.h>
-#include <sys/select.h>
-#include <netinet/in.h>
-#include <sys/types.h>
-#include <sys/fcntl.h>
 #include <arpa/inet.h>
+#include <fcntl.h>
+#include <netinet/in.h>
 #include <pwd.h>
-
+#include <sys/select.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/types.h>
 
 #include "client.h"
 
@@ -50,23 +49,26 @@ extern client_t *clients;
 extern int VERBOSE;
 extern int FORKED;
 
-
-
 void handle_inside(int inside, host_t *listen_h, host_t *bind_h, host_t *dst_h);
 void handle_outside(int inside, int outside, host_t *outside_h);
 
-int main_loop(int listensocket, host_t *listen_h, host_t *bind_h, host_t *dst_h);
-int start_listener (char *inip, char *inpt, char *srcip, char *srcpt, char *dstip,
-		    char *dstpt, char *pidfile, char *chrootdir, char *user);
+int main_loop(int listensocket, host_t *listen_h, host_t *bind_h,
+              host_t *dst_h);
+int start_listener(char *inip, char *inpt, char *srcip, char *srcpt,
+                   char *dstip, char *dstpt, char *pidfile, char *chrootdir,
+                   char *user);
 int daemonize(char *pidfile);
 int drop_privileges(char *user, char *chrootdir);
 
 int fill_set(fd_set *fds);
 int get_sender(fd_set *fds);
-int bindsocket( host_t *sock_h);
-void int_handler(int  sig);
-void verb_prbind (host_t *bind_h);
+int bindsocket(host_t *sock_h);
+void int_handler(int sig);
+void verb_prbind(host_t *bind_h);
 
-#define _IS_LINK_LOCAL(a) do { IN6_IS_ADDR_LINKLOCAL(a); } while(0)
+#define _IS_LINK_LOCAL(a)                                                      \
+  do {                                                                         \
+    IN6_IS_ADDR_LINKLOCAL(a);                                                  \
+  } while (0)
 
 #endif
diff --git a/udpxd.h b/udpxd.h
index 02c98ff..6a14360 100644
--- a/udpxd.h
+++ b/udpxd.h
@@ -31,8 +31,8 @@
 #include <unistd.h>
 
 #include <arpa/inet.h>
+#include <fcntl.h>
 #include <netinet/in.h>
-#include <sys/fcntl.h>
 #include <sys/socket.h>
 #include <sys/types.h>