瀏覽代碼

Merged revision(s) 45692-45694 from trunk:
* 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 -

svenbarth 5 年之前
父節點
當前提交
a5f9ff9507
共有 2 個文件被更改,包括 1 次插入17 次删除
  1. 1 0
      compiler/pdecsub.pas
  2. 0 17
      packages/winunits-base/src/httpapi.pp

+ 1 - 0
compiler/pdecsub.pas

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

+ 0 - 17
packages/winunits-base/src/httpapi.pp

@@ -64,23 +64,6 @@ interface
 {$PACKRECORDS C}
 {$PACKRECORDS C}
 {$ENDIF}
 {$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
   const
     HTTP_INITIALIZE_SERVER = $00000001;    
     HTTP_INITIALIZE_SERVER = $00000001;    
     HTTP_INITIALIZE_CONFIG = $00000002;    
     HTTP_INITIALIZE_CONFIG = $00000002;