From 438adce31dadf9bbfaa81ed3122fbcd4f2298a09 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Sat, 13 Jan 2024 10:08:42 +0100
Subject: [PATCH] Added Socket to the amalgamations.

---
 sfw/core/inet_address.cpp        |  2 ++
 sfw/core/inet_address.h          |  3 +++
 sfw/core/socket.h                |  2 ++
 tools/doc/index_template.md.html | 19 +++++++++++++++++++
 tools/merger/sfw_core.cpp.inl    | 10 ++++++++++
 tools/merger/sfw_core.h.inl      | 10 ++++++++++
 tools/merger/sfw_full.cpp.inl    | 10 ++++++++++
 tools/merger/sfw_full.h.inl      | 10 ++++++++++
 8 files changed, 66 insertions(+)

diff --git a/sfw/core/inet_address.cpp b/sfw/core/inet_address.cpp
index 8ed5570..0081173 100755
--- a/sfw/core/inet_address.cpp
+++ b/sfw/core/inet_address.cpp
@@ -8,7 +8,9 @@
 
 // Author: Shuo Chen (chenshuo at chenshuo dot com)
 
+//--STRIP
 #include "inet_address.h"
+//--STRIP
 
 #include <cstdio>
 #include <cstring>
diff --git a/sfw/core/inet_address.h b/sfw/core/inet_address.h
index 9c1aa82..08cef17 100755
--- a/sfw/core/inet_address.h
+++ b/sfw/core/inet_address.h
@@ -24,7 +24,9 @@
 
 //On windows link to ws2_32
 
+//--STRIP
 #include "int_types.h"
+//--STRIP
 
 #if defined(_WIN64) || defined(_WIN32)
 #include <ws2tcpip.h>
@@ -38,6 +40,7 @@ using uint16_t = unsigned short;
 #endif
 
 //--STRIP
+#include "int_types.h"
 #include "core/ustring.h"
 //--STRIP
 
diff --git a/sfw/core/socket.h b/sfw/core/socket.h
index 1138caf..57d13a1 100755
--- a/sfw/core/socket.h
+++ b/sfw/core/socket.h
@@ -17,7 +17,9 @@
  *
  */
 
+//--STRIP
 #include "inet_address.h"
+//--STRIP
 
 class Socket {
 public:
diff --git a/tools/doc/index_template.md.html b/tools/doc/index_template.md.html
index 771901d..01f5eec 100644
--- a/tools/doc/index_template.md.html
+++ b/tools/doc/index_template.md.html
@@ -757,6 +757,25 @@ SpinLock
 
 </details>
 
+Networking
+------------------------------------------------------------------
+
+Socket
+
+<a name="CLASS_InetAddress"></a>
+<details><summary>InetAddress</summary>
+
+   |||CLASS_InetAddress|||
+
+</details>
+
+<a name="CLASS_Socket"></a>
+<details><summary>Socket</summary>
+
+   |||CLASS_Socket|||
+
+</details>
+
 OBJECT
 ====================================================================================
 
diff --git a/tools/merger/sfw_core.cpp.inl b/tools/merger/sfw_core.cpp.inl
index f989931..1d51836 100644
--- a/tools/merger/sfw_core.cpp.inl
+++ b/tools/merger/sfw_core.cpp.inl
@@ -196,6 +196,16 @@
 //--STRIP
 {{FILE:sfw/core/dir_access.cpp}}
 
+//--STRIP
+//System includes
+//--STRIP
+{{FILE:sfw/core/inet_address.cpp}}
+//--STRIP
+//#include "core/error_macros.h"
+//#include "core/ustring.h"
+//--STRIP
+{{FILE:sfw/core/socket.cpp}}
+
 //--STRIP
 //#include "core/pool_vector.h"
 //#include "core/string_name.h"
diff --git a/tools/merger/sfw_core.h.inl b/tools/merger/sfw_core.h.inl
index 8ea899b..4488c0c 100644
--- a/tools/merger/sfw_core.h.inl
+++ b/tools/merger/sfw_core.h.inl
@@ -410,6 +410,16 @@
 //--STRIP
 {{FILE:sfw/core/dir_access.h}}
 
+//--STRIP
+//#include "int_types.h"
+//#include "core/ustring.h"
+//--STRIP
+{{FILE:sfw/core/inet_address.h}}
+//--STRIP
+//#include "inet_address.h"
+//--STRIP
+{{FILE:sfw/core/socket.h}}
+
 //--STRIP
 //no includes
 //--STRIP
diff --git a/tools/merger/sfw_full.cpp.inl b/tools/merger/sfw_full.cpp.inl
index 0b4c30a..64e42c2 100644
--- a/tools/merger/sfw_full.cpp.inl
+++ b/tools/merger/sfw_full.cpp.inl
@@ -368,6 +368,16 @@
 //--STRIP
 {{FILE:sfw/core/dir_access.cpp}}
 
+//--STRIP
+//System includes
+//--STRIP
+{{FILE:sfw/core/inet_address.cpp}}
+//--STRIP
+//#include "core/error_macros.h"
+//#include "core/ustring.h"
+//--STRIP
+{{FILE:sfw/core/socket.cpp}}
+
 //--STRIP
 //#include "core/pool_vector.h"
 //#include "core/string_name.h"
diff --git a/tools/merger/sfw_full.h.inl b/tools/merger/sfw_full.h.inl
index fe185b4..d66da56 100644
--- a/tools/merger/sfw_full.h.inl
+++ b/tools/merger/sfw_full.h.inl
@@ -415,6 +415,16 @@
 //--STRIP
 {{FILE:sfw/core/sfw_core.h}}
 
+//--STRIP
+//#include "int_types.h"
+//#include "core/ustring.h"
+//--STRIP
+{{FILE:sfw/core/inet_address.h}}
+//--STRIP
+//#include "inet_address.h"
+//--STRIP
+{{FILE:sfw/core/socket.h}}
+
 //===================  OBJECT SECTION  ===================
 
 //--STRIP