From c606162d3dd5288ed33557bf4c89ce436d1755b4 Mon Sep 17 00:00:00 2001 From: peter Date: Tue, 31 Oct 2006 07:36:13 +0000 Subject: [PATCH] * revert fpread to fdread fix, rename fdread in non-unix to fpread git-svn-id: trunk@5108 - --- rtl/inc/sockets.inc | 4 +- rtl/netware/sockets.pp | 20 +++++----- rtl/netwlibc/sockets.pp | 20 +++++----- rtl/os2/sockets.pas | 20 +++++----- rtl/win32/Makefile | 86 ++++++++++++++++++++--------------------- rtl/win32/Makefile.fpc | 2 +- 6 files changed, 76 insertions(+), 76 deletions(-) diff --git a/rtl/inc/sockets.inc b/rtl/inc/sockets.inc index d8be9990ff..60225ad7a3 100644 --- a/rtl/inc/sockets.inc +++ b/rtl/inc/sockets.inc @@ -34,8 +34,8 @@ end; Procedure IOSock(var F:text); begin case textrec(f).mode of - fmoutput : {$ifdef unix}fpWrite{$else}fdwrite{$endif}(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); + fmoutput : fpWrite(textrec(f).handle,textrec(f).bufptr^,textrec(f).bufpos); + fminput : textrec(f).BufEnd:=fpRead(textrec(f).handle,textrec(f).bufptr^,textrec(f).bufsize); end; textrec(f).bufpos:=0; end; diff --git a/rtl/netware/sockets.pp b/rtl/netware/sockets.pp index fc104cf17a..41f00d6d01 100644 --- a/rtl/netware/sockets.pp +++ b/rtl/netware/sockets.pp @@ -340,20 +340,20 @@ function fpRead(handle : longint;var bufptr;size : dword) : dword; SocketError:=0; end; {$else} -{ mimic the linux fdWrite/fdRead calls for the file/text socket wrapper } -function fdWrite(handle : longint;Const bufptr;size : dword) : dword; +{ mimic the linux fpWrite/fpRead calls for the file/text socket wrapper } +function fpWrite(handle : longint;Const bufptr;size : dword) : dword; begin - fdWrite := dword(WinSock.send(handle, bufptr, size, 0)); - if fdWrite = dword(SOCKET_ERROR) then + fpWrite := dword(WinSock.send(handle, bufptr, size, 0)); + if fpWrite = dword(SOCKET_ERROR) then begin SocketError := WSAGetLastError; - fdWrite := 0; + fpWrite := 0; end else SocketError := 0; end; -function fdRead(handle : longint;var bufptr;size : dword) : dword; +function fpRead(handle : longint;var bufptr;size : dword) : dword; var d : dword; @@ -361,18 +361,18 @@ function fdRead(handle : longint;var bufptr;size : dword) : dword; if ioctlsocket(handle,FIONREAD,@d) = SOCKET_ERROR then begin SocketError:=WSAGetLastError; - fdRead:=0; + fpRead:=0; exit; end; if d>0 then begin if size>d then size:=d; - fdRead := dword(WinSock.recv(handle, bufptr, size, 0)); - if fdRead = dword(SOCKET_ERROR) then + fpRead := dword(WinSock.recv(handle, bufptr, size, 0)); + if fpRead = dword(SOCKET_ERROR) then begin SocketError:= WSAGetLastError; - fdRead := 0; + fpRead := 0; end else SocketError:=0; end diff --git a/rtl/netwlibc/sockets.pp b/rtl/netwlibc/sockets.pp index f328199c98..db7fc0b2f2 100644 --- a/rtl/netwlibc/sockets.pp +++ b/rtl/netwlibc/sockets.pp @@ -339,20 +339,20 @@ function fpRead(handle : longint;var bufptr;size : dword) : dword; SocketError:=0; end; {$else} -{ mimic the linux fdWrite/fdRead calls for the file/text socket wrapper } -function fdWrite(handle : longint;Const bufptr;size : dword) : dword; +{ mimic the linux fpWrite/fpRead calls for the file/text socket wrapper } +function fpWrite(handle : longint;Const bufptr;size : dword) : dword; begin - fdWrite := dword(WinSock.send(handle, bufptr, size, 0)); - if fdWrite = dword(SOCKET_ERROR) then + fpWrite := dword(WinSock.send(handle, bufptr, size, 0)); + if fpWrite = dword(SOCKET_ERROR) then begin SocketError := WSAGetLastError; - fdWrite := 0; + fpWrite := 0; end else SocketError := 0; end; -function fdRead(handle : longint;var bufptr;size : dword) : dword; +function fpRead(handle : longint;var bufptr;size : dword) : dword; var d : dword; @@ -360,18 +360,18 @@ function fdRead(handle : longint;var bufptr;size : dword) : dword; if ioctlsocket(handle,FIONREAD,@d) = SOCKET_ERROR then begin SocketError:=WSAGetLastError; - fdRead:=0; + fpRead:=0; exit; end; if d>0 then begin if size>d then size:=d; - fdRead := dword(WinSock.recv(handle, bufptr, size, 0)); - if fdRead = dword(SOCKET_ERROR) then + fpRead := dword(WinSock.recv(handle, bufptr, size, 0)); + if fpRead = dword(SOCKET_ERROR) then begin SocketError:= WSAGetLastError; - fdRead := 0; + fpRead := 0; end else SocketError:=0; end diff --git a/rtl/os2/sockets.pas b/rtl/os2/sockets.pas index 77e452688f..7ec386556a 100644 --- a/rtl/os2/sockets.pas +++ b/rtl/os2/sockets.pas @@ -240,20 +240,20 @@ begin SocketPair:=-1; end; -{ mimic the linux fdWrite/fdRead calls for the file/text socket wrapper } -function fdWrite(handle : longint;Const bufptr;size : dword) : dword; +{ mimic the linux fpWrite/fpRead calls for the file/text socket wrapper } +function fpWrite(handle : longint;Const bufptr;size : dword) : dword; begin - fdWrite := dword(fpsend(handle, @bufptr, size, 0)); - if fdWrite = dword(-1) then + fpWrite := dword(fpsend(handle, @bufptr, size, 0)); + if fpWrite = dword(-1) then begin SocketError := so32dll.sock_errno; - fdWrite := 0; + fpWrite := 0; end else SocketError := 0; end; -function fdRead(handle : longint;var bufptr;size : dword) : dword; +function fpRead(handle : longint;var bufptr;size : dword) : dword; var d : dword; begin @@ -261,16 +261,16 @@ begin if d=dword(-1) then begin SocketError:=so32dll.sock_errno; - fdRead:=0; + fpRead:=0; end else begin if size>d then size:=d; - fdRead := dword(so32dll.recv(handle, bufptr, size, 0)); - if fdRead = dword(-1) then + fpRead := dword(so32dll.recv(handle, bufptr, size, 0)); + if fpRead = dword(-1) then begin SocketError:= so32dll.sock_errno; - fdRead := 0; + fpRead := 0; end else SocketError:=0; end; diff --git a/rtl/win32/Makefile b/rtl/win32/Makefile index 75cc958d69..9d083a23ee 100644 --- a/rtl/win32/Makefile +++ b/rtl/win32/Makefile @@ -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 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 override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-go32v2) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-win32) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-os2) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-freebsd) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-beos) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-netbsd) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-solaris) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-qnx) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-netware) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-openbsd) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-wdosx) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-emx) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-watcom) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-netwlibc) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-wince) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),m68k-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),m68k-freebsd) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),m68k-netbsd) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),m68k-amiga) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),m68k-atari) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),m68k-openbsd) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),m68k-palmos) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),powerpc-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),powerpc-netbsd) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),powerpc-amiga) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),powerpc-macos) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),powerpc-darwin) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),powerpc-morphos) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),sparc-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),sparc-netbsd) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),sparc-solaris) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),x86_64-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),x86_64-freebsd) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),x86_64-win64) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),arm-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),arm-palmos) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),arm-wince) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),arm-gba) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),powerpc64-linux) -override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) +override COMPILER_INCLUDEDIR+=$(INC) $(PROCINC) $(WINDIR) endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_SOURCEDIR+=$(INC) $(PROCINC) $(COMMON) $(WINDIR) @@ -1659,7 +1659,7 @@ ifeq ($(CPU_TARGET),powerpc) FPCCPUOPT:=-O1r endif else -FPCCPUOPT:=-O1r +FPCCPUOPT:=-O2 endif override FPCOPT+=-Ur -Xs $(FPCCPUOPT) -n override FPCOPTDEF+=RELEASE diff --git a/rtl/win32/Makefile.fpc b/rtl/win32/Makefile.fpc index 5bfe5b39f0..c11550edd7 100644 --- a/rtl/win32/Makefile.fpc +++ b/rtl/win32/Makefile.fpc @@ -33,7 +33,7 @@ fpcdir=../.. target=win32 [compiler] -includedir=$(INC) $(PROCINC) +includedir=$(INC) $(PROCINC) $(WINDIR) sourcedir=$(INC) $(PROCINC) $(COMMON) $(WINDIR)