From 779604d6a3b3fb68793d372cb1c110329663b805 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= <michael@freepascal.org>
Date: Mon, 6 Mar 2023 14:58:05 +0100
Subject: [PATCH] * Dotted filenames for package libmicrohttpd

---
 .../namespaced/Api.Microhttpd.pp              |  3 ++
 packages/libmicrohttpd/namespaces.lst         |  3 ++
 packages/libmicrohttpd/src/libmicrohttpd.pp   | 52 +++++++++++++------
 3 files changed, 42 insertions(+), 16 deletions(-)
 create mode 100644 packages/libmicrohttpd/namespaced/Api.Microhttpd.pp
 create mode 100644 packages/libmicrohttpd/namespaces.lst

diff --git a/packages/libmicrohttpd/namespaced/Api.Microhttpd.pp b/packages/libmicrohttpd/namespaced/Api.Microhttpd.pp
new file mode 100644
index 0000000000..af64750e31
--- /dev/null
+++ b/packages/libmicrohttpd/namespaced/Api.Microhttpd.pp
@@ -0,0 +1,3 @@
+unit Api.Microhttpd;
+{$DEFINE FPC_DOTTEDUNITS}
+{$i libmicrohttpd.pp}
diff --git a/packages/libmicrohttpd/namespaces.lst b/packages/libmicrohttpd/namespaces.lst
new file mode 100644
index 0000000000..32cb9b43af
--- /dev/null
+++ b/packages/libmicrohttpd/namespaces.lst
@@ -0,0 +1,3 @@
+src/libmicrohttpd.pp=namespaced/Api.Microhttpd.pp
+{s*:src/}=namespaced/
+{i+:src/}
diff --git a/packages/libmicrohttpd/src/libmicrohttpd.pp b/packages/libmicrohttpd/src/libmicrohttpd.pp
index 90820f455f..5b525541cb 100644
--- a/packages/libmicrohttpd/src/libmicrohttpd.pp
+++ b/packages/libmicrohttpd/src/libmicrohttpd.pp
@@ -17,10 +17,23 @@
    https://www.gnu.org/software/libmicrohttpd/
 }
 
+{$IFNDEF FPC_DOTTEDUNITS}
 unit libmicrohttpd;
+{$ENDIF FPC_DOTTEDUNITS}
 
 interface
 
+{$IFDEF FPC_DOTTEDUNITS}
+uses
+{$IFDEF MSWINDOWS}
+  WinApi.Winsock2,
+{$ENDIF}
+{$IFDEF FPC}
+  {$IFDEF UNIX}UnixApi.Base, UnixApi.Unix,{$ENDIF}System.CTypes, System.Net.Sockets
+{$ELSE}
+  WinTypes
+{$ENDIF};
+{$ELSE FPC_DOTTEDUNITS}
 uses
 {$IFDEF MSWINDOWS}
   WinSock2,
@@ -30,6 +43,7 @@ uses
 {$ELSE}
   WinTypes
 {$ENDIF};
+{$ENDIF FPC_DOTTEDUNITS}
 
 const
   MHD_LIB_NAME = {$IFDEF MSWINDOWS}'libmicrohttpd-10'{$ELSE}'microhttpd'{$ENDIF};
@@ -321,17 +335,23 @@ type
   Ppcchar = ^Pcchar;
   va_list = Pointer;
 {$IFDEF FPC}
-  cint = CTypes.cint;
-  cuint = CTypes.cuint;
-  cuint16 = CTypes.cuint16;
-  cuint64 = CTypes.cuint64;
-  culonglong = CTypes.culonglong;
-  socklen_t = {$IFDEF UNIX}BaseUnix.socklen_t{$ELSE}LongInt{$ENDIF};
-  size_t = {$IFDEF UNIX}BaseUnix{$ELSE}Sockets{$ENDIF}.size_t;
-  Psize_t = {$IFDEF UNIX}BaseUnix.pSize_t{$ELSE}^Sockets.size_t{$ENDIF};
-  Pfd_set = {$IFDEF UNIX}BaseUnix.pFDSet{$ELSE}WinSock2.PFDSet{$ENDIF};
-  ssize_t = {$IFDEF UNIX}BaseUnix{$ELSE}Sockets{$ENDIF}.ssize_t;
-  psockaddr = Sockets.psockaddr;
+  cint = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}CTypes.cint;
+  cuint = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}CTypes.cuint;
+  cuint16 = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}CTypes.cuint16;
+  cuint64 = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}CTypes.cuint64;
+  culonglong = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}CTypes.culonglong;
+  socklen_t = {$IFDEF UNIX}{$IFDEF FPC_DOTTEDUNITS}UnixApi.Base{$ELSE}BaseUnix{$ENDIF}.socklen_t{$ELSE}LongInt{$ENDIF};
+  size_t = {$IFDEF UNIX}{$IFDEF FPC_DOTTEDUNITS}UnixApi.Base{$ELSE}BaseUnix{$ENDIF}{$ELSE}{$IFDEF FPC_DOTTEDUNITS}System.Net.{$ENDIF}Sockets{$ENDIF}.size_t;
+  Psize_t = 
+  {$IFDEF UNIX}
+    {$IFDEF FPC_DOTTEDUNITS}UnixApi.Base{$ELSE}BaseUnix{$ENDIF}.pSize_t
+  {$ELSE}
+    ^{$IFDEF FPC_DOTTEDUNITS}System.Net.{$ENDIF}Sockets.size_t
+  {$ENDIF}
+  ;
+  Pfd_set = {$IFDEF UNIX}{$IFDEF FPC_DOTTEDUNITS}UnixApi.Base{$ELSE}BaseUnix{$ENDIF}.pFDSet{$ELSE}{$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}WinSock2.PFDSet{$ENDIF};
+  ssize_t = {$IFDEF UNIX}{$IFDEF FPC_DOTTEDUNITS}UnixApi.Base{$ELSE}BaseUnix{$ENDIF}{$ELSE}{$IFDEF FPC_DOTTEDUNITS}System.Net.{$ENDIF}Sockets{$ENDIF}.ssize_t;
+  psockaddr = {$IFDEF FPC_DOTTEDUNITS}System.Net.{$ENDIF}Sockets.psockaddr;
 {$ELSE}
   cint = LongInt;
   cuint = LongWord;
@@ -339,11 +359,11 @@ type
   cuint64 = UInt64;
   culonglong = UInt64;
   socklen_t = LongInt;
-  size_t = WinTypes.SIZE_T;
-  Psize_t = WinTypes.PSIZE_T;
-  Pfd_set = WinSock2.PFdSet;
-  ssize_t = WinTypes.SSIZE_T;
-  psockaddr = WinSock2.PSockAddr;
+  size_t = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}WinTypes.SIZE_T;
+  Psize_t = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}WinTypes.PSIZE_T;
+  Pfd_set = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}WinSock2.PFdSet;
+  ssize_t = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}WinTypes.SSIZE_T;
+  psockaddr = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}WinSock2.PSockAddr;
 {$ENDIF}
 {$IFNDEF MHD_SOCKET_DEFINED}
   PMHD_socket = ^MHD_socket;