paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-18 14:49:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

*wince: fix compilation, winsock->winsock2

Browse Source 
git-svn-id: trunk@5449 -
This commit is contained in:
oro06 2006-11-22 14:56:48 +00:00
parent 4dadd008da
commit 13d60d39ff
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
rtl/wince/sockets.pp
View File

@ -19,7 +19,7 @@ Interface
{$define maybelibc:=} {$define maybelibc:=}
Uses Uses
windows,winsock,ctypes; windows,winsock2,ctypes;
Type Type
size_t = cuint32; size_t = cuint32;
@ -48,7 +48,7 @@ Implementation
function fpsocket (domain:cint; xtype:cint; protocol: cint):cint; function fpsocket (domain:cint; xtype:cint; protocol: cint):cint;
begin begin
fpSocket:=WinSock.Socket(Domain,xtype,ProtoCol); fpSocket:=WinSock2.Socket(Domain,xtype,ProtoCol);
if fpSocket<0 then if fpSocket<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -57,7 +57,7 @@ end;
function fpsend (s:cint; msg:pointer; len:size_t; flags:cint):ssize_t; function fpsend (s:cint; msg:pointer; len:size_t; flags:cint):ssize_t;
begin begin
fpSend:=WinSock.Send(S,msg,len,flags); fpSend:=WinSock2.Send(S,msg,len,flags);
if fpSend<0 then if fpSend<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -67,7 +67,7 @@ end;
function fpsendto (s:cint; msg:pointer; len:size_t; flags:cint; tox :psockaddr; tolen: tsocklen):ssize_t; function fpsendto (s:cint; msg:pointer; len:size_t; flags:cint; tox :psockaddr; tolen: tsocklen):ssize_t;
begin begin
// Dubious construct, this should be checked. (IPV6 fails ?) // Dubious construct, this should be checked. (IPV6 fails ?)
fpSendTo:=WinSock.SendTo(S,msg,Len,Flags,Winsock.TSockAddr(tox^),toLen); fpSendTo:=WinSock2.SendTo(S,msg,Len,Flags,Winsock2.TSockAddr(tox^),toLen);
if fpSendTo<0 then if fpSendTo<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -76,7 +76,7 @@ end;
function fprecv (s:cint; buf: pointer; len: size_t; flags: cint):ssize_t; function fprecv (s:cint; buf: pointer; len: size_t; flags: cint):ssize_t;
begin begin
fpRecv:=WinSock.Recv(S,Buf,Len,Flags); fpRecv:=WinSock2.Recv(S,Buf,Len,Flags);
if fpRecv<0 then if fpRecv<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -86,7 +86,7 @@ end;
function fprecvfrom (s:cint; buf: pointer; len: size_t; flags: cint; from : psockaddr; fromlen : psocklen):ssize_t; function fprecvfrom (s:cint; buf: pointer; len: size_t; flags: cint; from : psockaddr; fromlen : psocklen):ssize_t;
begin begin
fpRecvFrom:=WinSock.RecvFrom(S,Buf,Len,Flags,Winsock.TSockAddr(from^),FromLen^); fpRecvFrom:=WinSock2.RecvFrom(S,Buf,Len,Flags,Winsock2.TSockAddr(from^),FromLen^);
if fpRecvFrom<0 then if fpRecvFrom<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -96,7 +96,7 @@ end;
function fpconnect (s:cint; name : psockaddr; namelen : tsocklen):cint; function fpconnect (s:cint; name : psockaddr; namelen : tsocklen):cint;
begin begin
fpConnect:=WinSock.Connect(S,WinSock.TSockAddr(name^),nameLen); fpConnect:=WinSock2.Connect(S,WinSock2.TSockAddr(name^),nameLen);
if fpConnect<0 then if fpConnect<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -105,7 +105,7 @@ end;
function fpshutdown (s:cint; how:cint):cint; function fpshutdown (s:cint; how:cint):cint;
begin begin
fpShutDown:=WinSock.ShutDown(S,How); fpShutDown:=WinSock2.ShutDown(S,How);
if fpShutDown<0 then if fpShutDown<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -142,7 +142,7 @@ end;
function fpbind (s:cint; addrx : psockaddr; addrlen : tsocklen):cint; function fpbind (s:cint; addrx : psockaddr; addrlen : tsocklen):cint;
begin begin
fpbind:=WinSock.Bind(S,WinSock.PSockAddr(Addrx),AddrLen); fpbind:=WinSock2.Bind(S,WinSock2.PSockAddr(Addrx),AddrLen);
if fpbind<0 then if fpbind<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -152,7 +152,7 @@ end;
function fplisten (s:cint; backlog : cint):cint; function fplisten (s:cint; backlog : cint):cint;
begin begin
fplisten:=WinSock.Listen(S,backlog); fplisten:=WinSock2.Listen(S,backlog);
if fplisten<0 then if fplisten<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -161,7 +161,7 @@ end;
function fpaccept (s:cint; addrx : psockaddr; addrlen : psocklen):cint; function fpaccept (s:cint; addrx : psockaddr; addrlen : psocklen):cint;
begin begin
fpAccept:=WinSock.Accept(S,WinSock.PSockAddr(Addrx),plongint(@AddrLen)); fpAccept:=WinSock2.Accept(S,WinSock2.PSockAddr(Addrx),plongint(@AddrLen));
if fpAccept<0 then if fpAccept<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -171,7 +171,7 @@ end;
function fpgetsockname (s:cint; name : psockaddr; namelen : psocklen):cint; function fpgetsockname (s:cint; name : psockaddr; namelen : psocklen):cint;
begin begin
fpGetSockName:=WinSock.GetSockName(S,WinSock.TSockAddr(name^),nameLen^); fpGetSockName:=WinSock2.GetSockName(S,WinSock2.TSockAddr(name^),nameLen^);
if fpGetSockName<0 then if fpGetSockName<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -180,7 +180,7 @@ end;
function fpgetpeername (s:cint; name : psockaddr; namelen : psocklen):cint; function fpgetpeername (s:cint; name : psockaddr; namelen : psocklen):cint;
begin begin
fpGetPeerName:=WinSock.GetPeerName(S,WinSock.TSockAddr(name^),NameLen^); fpGetPeerName:=WinSock2.GetPeerName(S,WinSock2.TSockAddr(name^),NameLen^);
if fpGetPeerName<0 then if fpGetPeerName<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -189,7 +189,7 @@ end;
function fpgetsockopt (s:cint; level:cint; optname:cint; optval:pointer; optlen : psocklen):cint; function fpgetsockopt (s:cint; level:cint; optname:cint; optval:pointer; optlen : psocklen):cint;
begin begin
fpGetSockOpt:=WinSock.GetSockOpt(S,Level,OptName,OptVal,OptLen^); fpGetSockOpt:=WinSock2.GetSockOpt(S,Level,OptName,OptVal,OptLen^);
if fpGetSockOpt<0 then if fpGetSockOpt<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -199,7 +199,7 @@ end;
function fpsetsockopt (s:cint; level:cint; optname:cint; optval:pointer; optlen :tsocklen):cint; function fpsetsockopt (s:cint; level:cint; optname:cint; optval:pointer; optlen :tsocklen):cint;
begin begin
fpSetSockOpt:=WinSock.SetSockOpt(S,Level,OptName,OptVal,OptLen); fpSetSockOpt:=WinSock2.SetSockOpt(S,Level,OptName,OptVal,OptLen);
if fpSetSockOpt<0 then if fpSetSockOpt<0 then
SocketError:=WSAGetLastError SocketError:=WSAGetLastError
else else
@ -215,7 +215,7 @@ end;
Function CloseSocket(Sock:Longint):Longint; Function CloseSocket(Sock:Longint):Longint;
var i : longint; var i : longint;
begin begin
i := Winsock.CloseSocket (Sock); i := Winsock2.CloseSocket (Sock);
if i <> 0 then if i <> 0 then
begin begin
SocketError:=WSAGetLastError; SocketError:=WSAGetLastError;
@ -286,7 +286,7 @@ end;
{ mimic the linux fpWrite/fpRead calls for the file/text socket wrapper } { mimic the linux fpWrite/fpRead calls for the file/text socket wrapper }
function fpWrite(handle : longint;Const bufptr;size : dword) : dword; function fpWrite(handle : longint;Const bufptr;size : dword) : dword;
begin begin
fpWrite := dword(WinSock.send(handle, bufptr, size, 0)); fpWrite := dword(WinSock2.send(handle, bufptr, size, 0));
if fpWrite = dword(SOCKET_ERROR) then if fpWrite = dword(SOCKET_ERROR) then
begin begin
SocketError := WSAGetLastError; SocketError := WSAGetLastError;
@ -311,7 +311,7 @@ function fpRead(handle : longint;var bufptr;size : dword) : dword;
begin begin
if size>d then if size>d then
size:=d; size:=d;
fpRead := dword(WinSock.recv(handle, bufptr, size, 0)); fpRead := dword(WinSock2.recv(handle, bufptr, size, 0));
if fpRead = dword(SOCKET_ERROR) then if fpRead = dword(SOCKET_ERROR) then
begin begin
SocketError:= WSAGetLastError; SocketError:= WSAGetLastError;
@ -326,7 +326,7 @@ function fpRead(handle : longint;var bufptr;size : dword) : dword;
{ mimic the linux fdWrite/fdRead calls for the file/text socket wrapper } { mimic the linux fdWrite/fdRead calls for the file/text socket wrapper }
function fdWrite(handle : longint;Const bufptr;size : dword) : dword; function fdWrite(handle : longint;Const bufptr;size : dword) : dword;
begin begin
fdWrite := dword(WinSock.send(handle, bufptr, size, 0)); fdWrite := dword(WinSock2.send(handle, bufptr, size, 0));
if fdWrite = dword(SOCKET_ERROR) then if fdWrite = dword(SOCKET_ERROR) then
begin begin
SocketError := WSAGetLastError; SocketError := WSAGetLastError;
@ -351,7 +351,7 @@ function fdRead(handle : longint;var bufptr;size : dword) : dword;
begin begin
if size>d then if size>d then
size:=d; size:=d;
fdRead := dword(WinSock.recv(handle, bufptr, size, 0)); fdRead := dword(WinSock2.recv(handle, bufptr, size, 0));
if fdRead = dword(SOCKET_ERROR) then if fdRead = dword(SOCKET_ERROR) then
begin begin
SocketError:= WSAGetLastError; SocketError:= WSAGetLastError;