Fix freeBSD

dosshell · dosshell · commit e00ddec33373 · 2026-04-12T17:12:27.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,11 +57,12 @@ add_custom_target(
 )
 set_target_properties(generate_version PROPERTIES FOLDER tinycsocket)
 
-# Header generation
+# Header generation (requires GNU m4 for undivert with filename)
+find_program(M4_EXECUTABLE gm4 m4 REQUIRED)
 add_custom_command(
     OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/include/tinycsocket.h
     COMMAND
-        m4 ${CMAKE_CURRENT_SOURCE_DIR}/src/tinycsocket.h.m4 >
+        ${M4_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/src/tinycsocket.h.m4 >
         ${CMAKE_CURRENT_SOURCE_DIR}/include/tinycsocket.h
     DEPENDS ${TINYCSOCKET_SRC} ${CMAKE_CURRENT_SOURCE_DIR}/src/tinycsocket.h.m4
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src
diff --git a/include/tinycsocket.h b/include/tinycsocket.h
@@ -29,7 +29,7 @@
 #ifndef TINYCSOCKET_INTERNAL_H_
 #define TINYCSOCKET_INTERNAL_H_
 
-static const char* const TCS_VERSION_TXT = "v0.3.59";
+static const char* const TCS_VERSION_TXT = "v0.3.60";
 static const char* const TCS_LICENSE_TXT =
     "Copyright 2018 Markus Lindelöw\n"
     "\n"
@@ -191,10 +191,9 @@ typedef unsigned int TcsInterfaceId; // TODO: GUID is used for in vista at newer
 #elif defined(TINYCSOCKET_USE_POSIX_IMPL)
 
 #if defined(TINYCSOCKET_IMPLEMENTATION) || defined(TCS_DEFINE_POSIX_MACROS)
-// POSIX feature test macros must be set before any system header is included.
-// Without these, glibc's <features.h> (pulled in by <stdbool.h>) locks in
-// strict C99 defaults that hide AI_PASSIVE, struct addrinfo, struct timeval,
-// u_short, SO_REUSEPORT, etc.
+// Only needed on glibc/Cygwin where -std=c99 restricts symbol visibility.
+// On BSD/musl, setting these RESTRICTS visibility instead of expanding it.
+#if defined(__linux__) || defined(__CYGWIN__)
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 600
 #endif
@@ -208,6 +207,7 @@ typedef unsigned int TcsInterfaceId; // TODO: GUID is used for in vista at newer
 #define _DEFAULT_SOURCE
 #endif
 #endif
+#endif
 
 typedef int TcsSocket;
 typedef unsigned int TcsInterfaceId;
diff --git a/src/tinycsocket_internal.h b/src/tinycsocket_internal.h
@@ -23,7 +23,7 @@
 #ifndef TINYCSOCKET_INTERNAL_H_
 #define TINYCSOCKET_INTERNAL_H_
 
-static const char* const TCS_VERSION_TXT = "v0.3.59";
+static const char* const TCS_VERSION_TXT = "v0.3.60";
 static const char* const TCS_LICENSE_TXT =
     "Copyright 2018 Markus Lindelöw\n"
     "\n"
@@ -185,10 +185,9 @@ typedef unsigned int TcsInterfaceId; // TODO: GUID is used for in vista at newer
 #elif defined(TINYCSOCKET_USE_POSIX_IMPL)
 
 #if defined(TINYCSOCKET_IMPLEMENTATION) || defined(TCS_DEFINE_POSIX_MACROS)
-// POSIX feature test macros must be set before any system header is included.
-// Without these, glibc's <features.h> (pulled in by <stdbool.h>) locks in
-// strict C99 defaults that hide AI_PASSIVE, struct addrinfo, struct timeval,
-// u_short, SO_REUSEPORT, etc.
+// Only needed on glibc/Cygwin where -std=c99 restricts symbol visibility.
+// On BSD/musl, setting these RESTRICTS visibility instead of expanding it.
+#if defined(__linux__) || defined(__CYGWIN__)
 #ifndef _XOPEN_SOURCE
 #define _XOPEN_SOURCE 600
 #endif
@@ -202,6 +201,7 @@ typedef unsigned int TcsInterfaceId; // TODO: GUID is used for in vista at newer
 #define _DEFAULT_SOURCE
 #endif
 #endif
+#endif
 
 typedef int TcsSocket;
 typedef unsigned int TcsInterfaceId;
diff --git a/t b/t
@@ -0,0 +1,70 @@
+[1mdiff --git a/include/tinycsocket.h b/include/tinycsocket.h[m
+[1mindex 5036e60..b06ef0c 100644[m
+[1m--- a/include/tinycsocket.h[m
+[1m+++ b/include/tinycsocket.h[m
+[36m@@ -29,7 +29,7 @@[m
+ #ifndef TINYCSOCKET_INTERNAL_H_[m
+ #define TINYCSOCKET_INTERNAL_H_[m
+ [m
+[31m-static const char* const TCS_VERSION_TXT = "v0.3.59";[m
+[32m+[m[32mstatic const char* const TCS_VERSION_TXT = "v0.3.60";[m
+ static const char* const TCS_LICENSE_TXT =[m
+     "Copyright 2018 Markus Lindelöw\n"[m
+     "\n"[m
+[36m@@ -191,10 +191,9 @@[m [mtypedef unsigned int TcsInterfaceId; // TODO: GUID is used for in vista at newer[m
+ #elif defined(TINYCSOCKET_USE_POSIX_IMPL)[m
+ [m
+ #if defined(TINYCSOCKET_IMPLEMENTATION) || defined(TCS_DEFINE_POSIX_MACROS)[m
+[31m-// POSIX feature test macros must be set before any system header is included.[m
+[31m-// Without these, glibc's <features.h> (pulled in by <stdbool.h>) locks in[m
+[31m-// strict C99 defaults that hide AI_PASSIVE, struct addrinfo, struct timeval,[m
+[31m-// u_short, SO_REUSEPORT, etc.[m
+[32m+[m[32m// Only needed on glibc/Cygwin where -std=c99 restricts symbol visibility.[m
+[32m+[m[32m// On BSD/musl, setting these RESTRICTS visibility instead of expanding it.[m
+[32m+[m[32m#if defined(__linux__) || defined(__CYGWIN__)[m
+ #ifndef _XOPEN_SOURCE[m
+ #define _XOPEN_SOURCE 600[m
+ #endif[m
+[36m@@ -208,6 +207,7 @@[m [mtypedef unsigned int TcsInterfaceId; // TODO: GUID is used for in vista at newer[m
+ #define _DEFAULT_SOURCE[m
+ #endif[m
+ #endif[m
+[32m+[m[32m#endif[m
+ [m
+ typedef int TcsSocket;[m
+ typedef unsigned int TcsInterfaceId;[m
+[1mdiff --git a/src/tinycsocket_internal.h b/src/tinycsocket_internal.h[m
+[1mindex a2c5b27..3c4db85 100644[m
+[1m--- a/src/tinycsocket_internal.h[m
+[1m+++ b/src/tinycsocket_internal.h[m
+[36m@@ -23,7 +23,7 @@[m
+ #ifndef TINYCSOCKET_INTERNAL_H_[m
+ #define TINYCSOCKET_INTERNAL_H_[m
+ [m
+[31m-static const char* const TCS_VERSION_TXT = "v0.3.59";[m
+[32m+[m[32mstatic const char* const TCS_VERSION_TXT = "v0.3.60";[m
+ static const char* const TCS_LICENSE_TXT =[m
+     "Copyright 2018 Markus Lindelöw\n"[m
+     "\n"[m
+[36m@@ -185,10 +185,9 @@[m [mtypedef unsigned int TcsInterfaceId; // TODO: GUID is used for in vista at newer[m
+ #elif defined(TINYCSOCKET_USE_POSIX_IMPL)[m
+ [m
+ #if defined(TINYCSOCKET_IMPLEMENTATION) || defined(TCS_DEFINE_POSIX_MACROS)[m
+[31m-// POSIX feature test macros must be set before any system header is included.[m
+[31m-// Without these, glibc's <features.h> (pulled in by <stdbool.h>) locks in[m
+[31m-// strict C99 defaults that hide AI_PASSIVE, struct addrinfo, struct timeval,[m
+[31m-// u_short, SO_REUSEPORT, etc.[m
+[32m+[m[32m// Only needed on glibc/Cygwin where -std=c99 restricts symbol visibility.[m
+[32m+[m[32m// On BSD/musl, setting these RESTRICTS visibility instead of expanding it.[m
+[32m+[m[32m#if defined(__linux__) || defined(__CYGWIN__)[m
+ #ifndef _XOPEN_SOURCE[m
+ #define _XOPEN_SOURCE 600[m
+ #endif[m
+[36m@@ -202,6 +201,7 @@[m [mtypedef unsigned int TcsInterfaceId; // TODO: GUID is used for in vista at newer[m
+ #define _DEFAULT_SOURCE[m
+ #endif[m
+ #endif[m
+[32m+[m[32m#endif[m
+ [m
+ typedef int TcsSocket;[m
+ typedef unsigned int TcsInterfaceId;[m

-Original file line number
+Diff line change
@@ @@ -0,0 +1,70 @@ @@
 +[1mdiff --git a/include/tinycsocket.h b/include/tinycsocket.h[m
 +[1mindex 5036e60..b06ef0c 100644[m
 +[1m--- a/include/tinycsocket.h[m
 +[1m+++ b/include/tinycsocket.h[m
 +[36m@@ -29,7 +29,7 @@[m
 + #ifndef TINYCSOCKET_INTERNAL_H_[m
 + #define TINYCSOCKET_INTERNAL_H_[m
 + [m
 +[31m-static const char* const TCS_VERSION_TXT = "v0.3.59";[m
 +[32m+[m[32mstatic const char* const TCS_VERSION_TXT = "v0.3.60";[m
 + static const char* const TCS_LICENSE_TXT =[m
 +     "Copyright 2018 Markus Lindelöw\n"[m
 +     "\n"[m
 +[36m@@ -191,10 +191,9 @@[m [mtypedef unsigned int TcsInterfaceId; // TODO: GUID is used for in vista at newer[m
 + #elif defined(TINYCSOCKET_USE_POSIX_IMPL)[m
 + [m
 + #if defined(TINYCSOCKET_IMPLEMENTATION) || defined(TCS_DEFINE_POSIX_MACROS)[m
 +[31m-// POSIX feature test macros must be set before any system header is included.[m
 +[31m-// Without these, glibc's <features.h> (pulled in by <stdbool.h>) locks in[m
 +[31m-// strict C99 defaults that hide AI_PASSIVE, struct addrinfo, struct timeval,[m
 +[31m-// u_short, SO_REUSEPORT, etc.[m
 +[32m+[m[32m// Only needed on glibc/Cygwin where -std=c99 restricts symbol visibility.[m
 +[32m+[m[32m// On BSD/musl, setting these RESTRICTS visibility instead of expanding it.[m
 +[32m+[m[32m#if defined(__linux__) || defined(__CYGWIN__)[m
 + #ifndef _XOPEN_SOURCE[m
 + #define _XOPEN_SOURCE 600[m
 + #endif[m
 +[36m@@ -208,6 +207,7 @@[m [mtypedef unsigned int TcsInterfaceId; // TODO: GUID is used for in vista at newer[m
 + #define _DEFAULT_SOURCE[m
 + #endif[m
 + #endif[m
 +[32m+[m[32m#endif[m
 + [m
 + typedef int TcsSocket;[m
 + typedef unsigned int TcsInterfaceId;[m
 +[1mdiff --git a/src/tinycsocket_internal.h b/src/tinycsocket_internal.h[m
 +[1mindex a2c5b27..3c4db85 100644[m
 +[1m--- a/src/tinycsocket_internal.h[m
 +[1m+++ b/src/tinycsocket_internal.h[m
 +[36m@@ -23,7 +23,7 @@[m
 + #ifndef TINYCSOCKET_INTERNAL_H_[m
 + #define TINYCSOCKET_INTERNAL_H_[m
 + [m
 +[31m-static const char* const TCS_VERSION_TXT = "v0.3.59";[m
 +[32m+[m[32mstatic const char* const TCS_VERSION_TXT = "v0.3.60";[m
 + static const char* const TCS_LICENSE_TXT =[m
 +     "Copyright 2018 Markus Lindelöw\n"[m
 +     "\n"[m
 +[36m@@ -185,10 +185,9 @@[m [mtypedef unsigned int TcsInterfaceId; // TODO: GUID is used for in vista at newer[m
 + #elif defined(TINYCSOCKET_USE_POSIX_IMPL)[m
 + [m
 + #if defined(TINYCSOCKET_IMPLEMENTATION) || defined(TCS_DEFINE_POSIX_MACROS)[m
 +[31m-// POSIX feature test macros must be set before any system header is included.[m
 +[31m-// Without these, glibc's <features.h> (pulled in by <stdbool.h>) locks in[m
 +[31m-// strict C99 defaults that hide AI_PASSIVE, struct addrinfo, struct timeval,[m
 +[31m-// u_short, SO_REUSEPORT, etc.[m
 +[32m+[m[32m// Only needed on glibc/Cygwin where -std=c99 restricts symbol visibility.[m
 +[32m+[m[32m// On BSD/musl, setting these RESTRICTS visibility instead of expanding it.[m
 +[32m+[m[32m#if defined(__linux__) || defined(__CYGWIN__)[m
 + #ifndef _XOPEN_SOURCE[m
 + #define _XOPEN_SOURCE 600[m
 + #endif[m
 +[36m@@ -202,6 +201,7 @@[m [mtypedef unsigned int TcsInterfaceId; // TODO: GUID is used for in vista at newer[m
 + #define _DEFAULT_SOURCE[m
 + #endif[m
 + #endif[m
 +[32m+[m[32m#endif[m
 + [m
 + typedef int TcsSocket;[m
 + typedef unsigned int TcsInterfaceId;[m