From 0afb5bf625c03385295eecdf498e679d48bda9f5 Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Mon, 16 Sep 2024 18:34:58 +0200
Subject: [PATCH] Define use LWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS for
 NetBSD/OpenBSD instead of ignoring compile errors

---
 CMakeLists.txt   | 11 +++++------
 app/unixaf_app.c | 18 +++---------------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96de7f5..92a932f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,6 +52,11 @@ target_compile_definitions(lwipcontribunixsys PRIVATE ${LWIP_DEFINITIONS} ${LWIP
 target_link_libraries(lwipcontribunixsys PUBLIC ${LWIP_MBEDTLS_LINK_LIBRARIES})
 target_link_libraries(lwipcontribunixsys PUBLIC Threads::Threads)
 
+
+if (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
+    target_compile_definitions(lwipcontribunixsys PUBLIC -DLWIP_DONT_PROVIDE_BYTEORDER_FUNCTIONS)
+endif ()
+
 # Avoid format specifies type 'unsigned long' but the argument has type 'clock_t' (aka 'int') warning
 target_compile_options(lwipcontribunixsys PRIVATE -Wno-format)
 
@@ -91,9 +96,3 @@ if (NOT "${HAVE_ARC4RANDOM}")
 endif()
 target_link_libraries(lwipovpn PRIVATE ${LWIP_SANITIZER_LIBS} lwipcontribexamples lwipcontribapps lwipcontribaddons lwipallapps lwipcontribunixsys lwipcore lwipmbedtls)
 
-
-# Ignore htons redefined error
-if (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
-    target_compile_options(lwipcontribunixsys PRIVATE -Wno-macro-redefined)
-    target_compile_options(lwipovpn PRIVATE -Wno-macro-redefined)
-endif ()
\ No newline at end of file
diff --git a/app/unixaf_app.c b/app/unixaf_app.c
index 45a681f..6f0a9b4 100644
--- a/app/unixaf_app.c
+++ b/app/unixaf_app.c
@@ -33,10 +33,9 @@
  */
 
 /* C runtime includes */
-#include <stdio.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <time.h>
+//#include <stdio.h>
+//#include <stdlib.h>
+//#include <time.h>
 #include <string.h>
 #include <stdbool.h>
 
@@ -44,26 +43,17 @@
 #include "lwip/opt.h"
 
 #include "lwip/sys.h"
-#include "lwip/timeouts.h"
 #include "lwip/debug.h"
-#include "lwip/stats.h"
-#include "lwip/init.h"
 #include "lwip/tcpip.h"
 #include "lwip/netif.h"
-#include "lwip/api.h"
 
-#include "lwip/tcp.h"
-#include "lwip/udp.h"
-#include "lwip/dns.h"
 #include "lwip/dhcp.h"
-#include "lwip/autoip.h"
 
 /* lwIP netif includes */
 #include "lwip/etharp.h"
 #include "netif/ethernet.h"
 
 /* applications includes */
-#include "lwip/apps/netbiosns.h"
 #include "lwip/apps/httpd.h"
 #include "apps/httpserver/httpserver-netconn.h"
 #include "apps/netio/netio.h"
@@ -92,8 +82,6 @@
 
 #include "unixaf.h"
 
-#include "netif/ppp/ppp_opts.h"
-
 /* include the port-dependent configuration */
 #include "afunix_config.h"