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

* revert fpread to fdread fix, rename fdread in non-unix to fpread

Browse Source 
git-svn-id: trunk@5108 -
This commit is contained in:
peter 2006-10-31 07:36:13 +00:00
parent 070606c267
commit c606162d3d
6 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rtl/inc/sockets.inc
View File

@ -34,8 +34,8 @@ end;
Procedure IOSock(var F:text); Procedure IOSock(var F:text);
begin begin
case textrec(f).mode of case textrec(f).mode of
fmoutput : {$ifdef unix}fpWrite{$else}fdwrite{$endif}(textrec(f).handle,textrec(f).bufptr^,textrec(f).bufpos); fmoutput : fpWrite(textrec(f).handle,textrec(f).bufptr^,textrec(f).bufpos);
fminput : textrec(f).BufEnd:={$ifdef Unix}fpRead{$else}fdread{$endif}(textrec(f).handle,textrec(f).bufptr^,textrec(f).bufsize); fminput : textrec(f).BufEnd:=fpRead(textrec(f).handle,textrec(f).bufptr^,textrec(f).bufsize);
end; end;
textrec(f).bufpos:=0; textrec(f).bufpos:=0;
end; end;

20
rtl/netware/sockets.pp
View File

@ -340,20 +340,20 @@ function fpRead(handle : longint;var bufptr;size : dword) : dword;
SocketError:=0; SocketError:=0;
end; end;
{$else} {$else}
{ mimic the linux fdWrite/fdRead calls for the file/text socket wrapper } { mimic the linux fpWrite/fpRead calls for the file/text socket wrapper }
function fdWrite(handle : longint;Const bufptr;size : dword) : dword; function fpWrite(handle : longint;Const bufptr;size : dword) : dword;
begin begin
fdWrite := dword(WinSock.send(handle, bufptr, size, 0)); fpWrite := dword(WinSock.send(handle, bufptr, size, 0));
if fdWrite = dword(SOCKET_ERROR) then if fpWrite = dword(SOCKET_ERROR) then
begin begin
SocketError := WSAGetLastError; SocketError := WSAGetLastError;
fdWrite := 0; fpWrite := 0;
end end
else else
SocketError := 0; SocketError := 0;
end; end;
function fdRead(handle : longint;var bufptr;size : dword) : dword; function fpRead(handle : longint;var bufptr;size : dword) : dword;
var var
d : dword; d : dword;
@ -361,18 +361,18 @@ function fdRead(handle : longint;var bufptr;size : dword) : dword;
if ioctlsocket(handle,FIONREAD,@d) = SOCKET_ERROR then if ioctlsocket(handle,FIONREAD,@d) = SOCKET_ERROR then
begin begin
SocketError:=WSAGetLastError; SocketError:=WSAGetLastError;
fdRead:=0; fpRead:=0;
exit; exit;
end; end;
if d>0 then if d>0 then
begin begin
if size>d then if size>d then
size:=d; size:=d;
fdRead := dword(WinSock.recv(handle, bufptr, size, 0)); fpRead := dword(WinSock.recv(handle, bufptr, size, 0));
if fdRead = dword(SOCKET_ERROR) then if fpRead = dword(SOCKET_ERROR) then
begin begin
SocketError:= WSAGetLastError; SocketError:= WSAGetLastError;
fdRead := 0; fpRead := 0;
end else end else
SocketError:=0; SocketError:=0;
end end

20
rtl/netwlibc/sockets.pp
View File

@ -339,20 +339,20 @@ function fpRead(handle : longint;var bufptr;size : dword) : dword;
SocketError:=0; SocketError:=0;
end; end;
{$else} {$else}
{ mimic the linux fdWrite/fdRead calls for the file/text socket wrapper } { mimic the linux fpWrite/fpRead calls for the file/text socket wrapper }
function fdWrite(handle : longint;Const bufptr;size : dword) : dword; function fpWrite(handle : longint;Const bufptr;size : dword) : dword;
begin begin
fdWrite := dword(WinSock.send(handle, bufptr, size, 0)); fpWrite := dword(WinSock.send(handle, bufptr, size, 0));
if fdWrite = dword(SOCKET_ERROR) then if fpWrite = dword(SOCKET_ERROR) then
begin begin
SocketError := WSAGetLastError; SocketError := WSAGetLastError;
fdWrite := 0; fpWrite := 0;
end end
else else
SocketError := 0; SocketError := 0;
end; end;
function fdRead(handle : longint;var bufptr;size : dword) : dword; function fpRead(handle : longint;var bufptr;size : dword) : dword;
var var
d : dword; d : dword;
@ -360,18 +360,18 @@ function fdRead(handle : longint;var bufptr;size : dword) : dword;
if ioctlsocket(handle,FIONREAD,@d) = SOCKET_ERROR then if ioctlsocket(handle,FIONREAD,@d) = SOCKET_ERROR then
begin begin
SocketError:=WSAGetLastError; SocketError:=WSAGetLastError;
fdRead:=0; fpRead:=0;
exit; exit;
end; end;
if d>0 then if d>0 then
begin begin
if size>d then if size>d then
size:=d; size:=d;
fdRead := dword(WinSock.recv(handle, bufptr, size, 0)); fpRead := dword(WinSock.recv(handle, bufptr, size, 0));
if fdRead = dword(SOCKET_ERROR) then if fpRead = dword(SOCKET_ERROR) then
begin begin
SocketError:= WSAGetLastError; SocketError:= WSAGetLastError;
fdRead := 0; fpRead := 0;
end else end else
SocketError:=0; SocketError:=0;
end end

20
rtl/os2/sockets.pas
View File

@ -240,20 +240,20 @@ begin
SocketPair:=-1; SocketPair:=-1;
end; end;
{ mimic the linux fdWrite/fdRead calls for the file/text socket wrapper } { mimic the linux fpWrite/fpRead calls for the file/text socket wrapper }
function fdWrite(handle : longint;Const bufptr;size : dword) : dword; function fpWrite(handle : longint;Const bufptr;size : dword) : dword;
begin begin
fdWrite := dword(fpsend(handle, @bufptr, size, 0)); fpWrite := dword(fpsend(handle, @bufptr, size, 0));
if fdWrite = dword(-1) then if fpWrite = dword(-1) then
begin begin
SocketError := so32dll.sock_errno; SocketError := so32dll.sock_errno;
fdWrite := 0; fpWrite := 0;
end end
else else
SocketError := 0; SocketError := 0;
end; end;
function fdRead(handle : longint;var bufptr;size : dword) : dword; function fpRead(handle : longint;var bufptr;size : dword) : dword;
var var
d : dword; d : dword;
begin begin
@ -261,16 +261,16 @@ begin
if d=dword(-1) then if d=dword(-1) then
begin begin
SocketError:=so32dll.sock_errno; SocketError:=so32dll.sock_errno;
fdRead:=0; fpRead:=0;
end else end else
begin begin
if size>d then if size>d then
size:=d; size:=d;
fdRead := dword(so32dll.recv(handle, bufptr, size, 0)); fpRead := dword(so32dll.recv(handle, bufptr, size, 0));
if fdRead = dword(-1) then if fpRead = dword(-1) then
begin begin
SocketError:= so32dll.sock_errno; SocketError:= so32dll.sock_errno;
fdRead := 0; fpRead := 0;
end else end else
SocketError:=0; SocketError:=0;
end; end;

86
rtl/win32/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/08/20] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/10/31]
# #
default: all default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-palmos arm-wince arm-gba powerpc64-linux
@ -620,127 +620,127 @@ override TARGET_RSTS+=math varutils typinfo variants classes dateutils sysconst
endif endif
override INSTALL_FPCPACKAGE=y override INSTALL_FPCPACKAGE=y
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-go32v2) ifeq ($(FULL_TARGET),i386-go32v2)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-win32) ifeq ($(FULL_TARGET),i386-win32)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-os2) ifeq ($(FULL_TARGET),i386-os2)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-freebsd) ifeq ($(FULL_TARGET),i386-freebsd)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-beos) ifeq ($(FULL_TARGET),i386-beos)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-netbsd) ifeq ($(FULL_TARGET),i386-netbsd)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-solaris) ifeq ($(FULL_TARGET),i386-solaris)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-qnx) ifeq ($(FULL_TARGET),i386-qnx)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-netware) ifeq ($(FULL_TARGET),i386-netware)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-openbsd) ifeq ($(FULL_TARGET),i386-openbsd)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-wdosx) ifeq ($(FULL_TARGET),i386-wdosx)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-darwin) ifeq ($(FULL_TARGET),i386-darwin)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-emx) ifeq ($(FULL_TARGET),i386-emx)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-watcom) ifeq ($(FULL_TARGET),i386-watcom)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-netwlibc) ifeq ($(FULL_TARGET),i386-netwlibc)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-wince) ifeq ($(FULL_TARGET),i386-wince)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),m68k-linux) ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),m68k-freebsd) ifeq ($(FULL_TARGET),m68k-freebsd)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),m68k-netbsd) ifeq ($(FULL_TARGET),m68k-netbsd)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),m68k-amiga) ifeq ($(FULL_TARGET),m68k-amiga)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),m68k-atari) ifeq ($(FULL_TARGET),m68k-atari)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),m68k-openbsd) ifeq ($(FULL_TARGET),m68k-openbsd)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),m68k-palmos) ifeq ($(FULL_TARGET),m68k-palmos)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),powerpc-linux) ifeq ($(FULL_TARGET),powerpc-linux)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),powerpc-netbsd) ifeq ($(FULL_TARGET),powerpc-netbsd)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),powerpc-amiga) ifeq ($(FULL_TARGET),powerpc-amiga)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),powerpc-macos) ifeq ($(FULL_TARGET),powerpc-macos)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),powerpc-darwin) ifeq ($(FULL_TARGET),powerpc-darwin)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),powerpc-morphos) ifeq ($(FULL_TARGET),powerpc-morphos)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),sparc-linux) ifeq ($(FULL_TARGET),sparc-linux)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),sparc-netbsd) ifeq ($(FULL_TARGET),sparc-netbsd)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),sparc-solaris) ifeq ($(FULL_TARGET),sparc-solaris)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),x86_64-linux) ifeq ($(FULL_TARGET),x86_64-linux)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),x86_64-freebsd) ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),arm-linux) ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),arm-palmos) ifeq ($(FULL_TARGET),arm-palmos)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),arm-wince) ifeq ($(FULL_TARGET),arm-wince)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),arm-gba) ifeq ($(FULL_TARGET),arm-gba)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR)
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR)
@ -1659,7 +1659,7 @@ ifeq ($(CPU_TARGET),powerpc)
FPCCPUOPT:=-O1r FPCCPUOPT:=-O1r
endif endif
else else
FPCCPUOPT:=-O1r FPCCPUOPT:=-O2
endif endif
override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n
override FPCOPTDEF+=RELEASE override FPCOPTDEF+=RELEASE

2
rtl/win32/Makefile.fpc
View File

@ -33,7 +33,7 @@ fpcdir=../..
target=win32 target=win32
[compiler] [compiler]
includedir=$(INC) $(PROCINC) includedir=$(INC) $(PROCINC) $(WINDIR)
sourcedir=$(INC) $(PROCINC) $(COMMON) $(WINDIR) sourcedir=$(INC) $(PROCINC) $(COMMON) $(WINDIR)