#39

Author: Mercury13

Src/Curl.Easy.pas

@@ -6,9 +6,7 @@ interface
   // System
   System.Classes, System.SysUtils,
   // cUrl
-  Curl.Lib, Curl.Interfaces,
-  // Windows
-  Winapi.Winsock2;
+  Curl.Lib, Curl.Interfaces;
 
 type
   TCurlVerifyHost = (
@@ -143,7 +141,7 @@ interface
     function GetInfo(aInfo : TCurlDoubleInfoDeprecated) : double;  overload;  deprecated 'Use TCurlOffInfo version';
     function GetInfo(aInfo : TCurlOffInfo) : TCurlOff;  overload;
     function GetInfo(aInfo : TCurlPtrInfo) : pointer;  overload;
-    function GetInfo(aInfo : TCurlSocketInfo) : TSocket;  overload;
+    function GetInfo(aInfo : TCurlSocketInfo) : TCurlSocket;  overload;
 
     ///  Returns response code. Equivalent to GetInfo(CURLINFO_RESPONSE_CODE).
     function GetResponseCode : longint;
@@ -248,7 +246,7 @@   TEasyCurlImpl = class (TInterfacedObject, ICurl)
     function GetInfo(aInfo : TCurlDoubleInfoDeprecated) : double;  overload;
     function GetInfo(aInfo : TCurlOffInfo) : TCurlOff;  overload;
     function GetInfo(aInfo : TCurlPtrInfo) : pointer;  overload;
-    function GetInfo(aInfo : TCurlSocketInfo) : TSocket;  overload;
+    function GetInfo(aInfo : TCurlSocketInfo) : TCurlSocket;  overload;
 
     function GetResponseCode : longint;
 
@@ -414,7 +412,7 @@ function TEasyCurlImpl.GetInfo(aInfo : TCurlOffInfo) : TCurlOff;
   RaiseIf(curl_easy_getinfo(fHandle, aInfo, Result));
 end;
 
-function TEasyCurlImpl.GetInfo(aInfo : TCurlSocketInfo) : TSocket;
+function TEasyCurlImpl.GetInfo(aInfo : TCurlSocketInfo) : TCurlSocket;
 begin
   RaiseIf(curl_easy_getinfo(fHandle, aInfo, Result));
 end;

Src/Curl.Lib.pas

@@ -28,6 +28,7 @@ interface
   // Primitive cUrl types
   TUnixTime   = NativeUInt;
   TCurlOff    = int64;
+  TCurlSocket = TSocket;
 
   TCurlInner = record end;
   HCurl = ^TCurlInner;
@@ -55,7 +56,7 @@   TCurlInner = record end;
 
 const
   // cUrl constants
-  CURL_SOCKET_BAD = High(TSocket);
+  CURL_SOCKET_BAD = High(TCurlSocket);
 
   CURL_HTTPPOST_FILENAME    = 1 shl 0;   // specified content is a file name
   CURL_HTTPPOST_READFILE    = 1 shl 1;   // specified content is a file name
@@ -252,7 +253,7 @@   TCurlFileInfo = record
 
   EvCurlSockopt = function(
           ClientP : pointer;
-          Curlfd : TSocket;
+          Curlfd : TCurlSocket;
           Purpose : TCurlSockType) : TCurlSockOpt;  cdecl;
 
   TCurlSockAddr = record
@@ -264,11 +265,11 @@   TCurlSockAddr = record
   EvCurlOpenSocket = function(
           ClientP : integer;
           Purpose : TCurlSockType;
-          var Address : TCurlSockAddr) : TSocket;  cdecl;
+          var Address : TCurlSockAddr) : TCurlSocket;  cdecl;
 
   EvCurlCloseSocket = function (
           ClientP : integer;
-          Item : TSocket) : integer;  cdecl;
+          Item : TCurlSocket) : integer;  cdecl;
 
   EvCurlIoctl = function (
           Handle : HCurl;
@@ -2661,7 +2662,7 @@ function curl_easy_getinfo(
 function curl_easy_getinfo(
       curl : HCurl;
       info : TCurlSocketInfo;
-      var p : TSocket) : TCurlCode;  overload;  inline;
+      var p : TCurlSocket) : TCurlCode;  overload;  inline;
 
 function curl_easy_getinfo(
       curl : HCurl;
@@ -3049,7 +3050,7 @@ function curl_easy_getinfo(
 function curl_easy_getinfo(
       curl : HCurl;
       info : TCurlSocketInfo;
-      var p : TSocket) : TCurlCode;
+      var p : TCurlSocket) : TCurlCode;
 begin
   Result := curl_easy_getinfo_initial(curl, info, @p);
 end;