paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-06-06 06:40:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 45692-45694 from trunk:

Browse Source 
* partial fix for Mantis #37253: po_hascallingconvention needs to be set as well when setting tprocdef.proccalloption
........
- partial fix for Mantis #37253: use SOCKADDR_STORAGE provided by the WinSock2 unit (which also has the correct size)
........
- remove FPC 3.0 compatibility IFDEF
........

git-svn-id: branches/fixes_3_2@45699 -
This commit is contained in:
svenbarth 2020-06-26 21:15:22 +00:00
parent 09e9b70562
commit a5f9ff9507
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/pdecsub.pas
View File

@ -2352,6 +2352,7 @@ begin
pd.proccalloption:=pocall_cdecl
else
pd.proccalloption:=pocall_stdcall;
include(pd.procoptions,po_hascallingconvention);
end;

17
packages/winunits-base/src/httpapi.pp
View File

@ -64,23 +64,6 @@ interface
{$PACKRECORDS C}
{$ENDIF}
{$IFDEF VER3_0}
type
PWSTR = PWideChar;
{$MACRO ON}
{$DEFINE winapi:=stdcall}
{$ENDIF}
type
SOCKADDR_STORAGE = record
ss_family: Int16;
__ss_pad1: array[0..47] of Byte;
__ss_align: Int64;
__ss_pad2: array[0..64] of Byte;
end;
const
HTTP_INITIALIZE_SERVER = $00000001;
HTTP_INITIALIZE_CONFIG = $00000002;