* Dotted filenames for package libmicrohttpd

This commit is contained in:
Michaël Van Canneyt 2023-03-06 14:58:05 +01:00
parent 09dd03240d
commit 779604d6a3
3 changed files with 42 additions and 16 deletions

View File

@ -0,0 +1,3 @@
unit Api.Microhttpd;
{$DEFINE FPC_DOTTEDUNITS}
{$i libmicrohttpd.pp}

View File

@ -0,0 +1,3 @@
src/libmicrohttpd.pp=namespaced/Api.Microhttpd.pp
{s*:src/}=namespaced/
{i+:src/}

View File

@ -17,10 +17,23 @@
https://www.gnu.org/software/libmicrohttpd/ https://www.gnu.org/software/libmicrohttpd/
} }
{$IFNDEF FPC_DOTTEDUNITS}
unit libmicrohttpd; unit libmicrohttpd;
{$ENDIF FPC_DOTTEDUNITS}
interface 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 uses
{$IFDEF MSWINDOWS} {$IFDEF MSWINDOWS}
WinSock2, WinSock2,
@ -30,6 +43,7 @@ uses
{$ELSE} {$ELSE}
WinTypes WinTypes
{$ENDIF}; {$ENDIF};
{$ENDIF FPC_DOTTEDUNITS}
const const
MHD_LIB_NAME = {$IFDEF MSWINDOWS}'libmicrohttpd-10'{$ELSE}'microhttpd'{$ENDIF}; MHD_LIB_NAME = {$IFDEF MSWINDOWS}'libmicrohttpd-10'{$ELSE}'microhttpd'{$ENDIF};
@ -321,17 +335,23 @@ type
Ppcchar = ^Pcchar; Ppcchar = ^Pcchar;
va_list = Pointer; va_list = Pointer;
{$IFDEF FPC} {$IFDEF FPC}
cint = CTypes.cint; cint = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}CTypes.cint;
cuint = CTypes.cuint; cuint = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}CTypes.cuint;
cuint16 = CTypes.cuint16; cuint16 = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}CTypes.cuint16;
cuint64 = CTypes.cuint64; cuint64 = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}CTypes.cuint64;
culonglong = CTypes.culonglong; culonglong = {$IFDEF FPC_DOTTEDUNITS}System.{$ENDIF}CTypes.culonglong;
socklen_t = {$IFDEF UNIX}BaseUnix.socklen_t{$ELSE}LongInt{$ENDIF}; socklen_t = {$IFDEF UNIX}{$IFDEF FPC_DOTTEDUNITS}UnixApi.Base{$ELSE}BaseUnix{$ENDIF}.socklen_t{$ELSE}LongInt{$ENDIF};
size_t = {$IFDEF UNIX}BaseUnix{$ELSE}Sockets{$ENDIF}.size_t; 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}BaseUnix.pSize_t{$ELSE}^Sockets.size_t{$ENDIF}; Psize_t =
Pfd_set = {$IFDEF UNIX}BaseUnix.pFDSet{$ELSE}WinSock2.PFDSet{$ENDIF}; {$IFDEF UNIX}
ssize_t = {$IFDEF UNIX}BaseUnix{$ELSE}Sockets{$ENDIF}.ssize_t; {$IFDEF FPC_DOTTEDUNITS}UnixApi.Base{$ELSE}BaseUnix{$ENDIF}.pSize_t
psockaddr = Sockets.psockaddr; {$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} {$ELSE}
cint = LongInt; cint = LongInt;
cuint = LongWord; cuint = LongWord;
@ -339,11 +359,11 @@ type
cuint64 = UInt64; cuint64 = UInt64;
culonglong = UInt64; culonglong = UInt64;
socklen_t = LongInt; socklen_t = LongInt;
size_t = WinTypes.SIZE_T; size_t = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}WinTypes.SIZE_T;
Psize_t = WinTypes.PSIZE_T; Psize_t = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}WinTypes.PSIZE_T;
Pfd_set = WinSock2.PFdSet; Pfd_set = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}WinSock2.PFdSet;
ssize_t = WinTypes.SSIZE_T; ssize_t = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}WinTypes.SSIZE_T;
psockaddr = WinSock2.PSockAddr; psockaddr = {$IFDEF FPC_DOTTEDUNITS}WinApi.{$ENDIF}WinSock2.PSockAddr;
{$ENDIF} {$ENDIF}
{$IFNDEF MHD_SOCKET_DEFINED} {$IFNDEF MHD_SOCKET_DEFINED}
PMHD_socket = ^MHD_socket; PMHD_socket = ^MHD_socket;