paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 20:29:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed building on win64

Browse Source 
git-svn-id: trunk@3273 -
This commit is contained in:
florian 2006-04-18 19:58:22 +00:00
parent 3f2f694d48
commit 9ce9a5e814
6 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitattributes vendored
View File

@ -1014,13 +1014,13 @@ fcl/unix/pipes.inc svneol=native#text/plain
fcl/unix/process.inc svneol=native#text/plain fcl/unix/process.inc svneol=native#text/plain
fcl/unix/resolve.inc svneol=native#text/plain fcl/unix/resolve.inc svneol=native#text/plain
fcl/unix/simpleipc.inc svneol=native#text/plain fcl/unix/simpleipc.inc svneol=native#text/plain
fcl/win32/eventlog.inc svneol=native#text/plain fcl/win/eventlog.inc svneol=native#text/plain
fcl/win/pipes.inc svneol=native#text/plain
fcl/win32/fclel.mc -text fcl/win32/fclel.mc -text
fcl/win32/fclel.rc -text fcl/win32/fclel.rc -text
fcl/win32/fclel.res -text fcl/win32/fclel.res -text
fcl/win32/fileinfo.pp svneol=native#text/plain fcl/win32/fileinfo.pp svneol=native#text/plain
fcl/win32/httpapp.pp svneol=native#text/plain fcl/win32/httpapp.pp svneol=native#text/plain
fcl/win32/pipes.inc svneol=native#text/plain
fcl/win32/process.inc svneol=native#text/plain fcl/win32/process.inc svneol=native#text/plain
fcl/win32/resolve.inc svneol=native#text/plain fcl/win32/resolve.inc svneol=native#text/plain
fcl/win32/simpleipc.inc svneol=native#text/plain fcl/win32/simpleipc.inc svneol=native#text/plain

6
fcl/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/07] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2006/04/18]
# #
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-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 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-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 powerpc64-linux
@ -942,7 +942,7 @@ ifeq ($(FULL_TARGET),i386-go32v2)
override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
endif endif
ifeq ($(FULL_TARGET),i386-win32) ifeq ($(FULL_TARGET),i386-win32)
override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc win
endif endif
ifeq ($(FULL_TARGET),i386-os2) ifeq ($(FULL_TARGET),i386-os2)
override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc
@ -1038,7 +1038,7 @@ ifeq ($(FULL_TARGET),x86_64-freebsd)
override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc unix override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc unix
endif endif
ifeq ($(FULL_TARGET),x86_64-win64) ifeq ($(FULL_TARGET),x86_64-win64)
override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc win
endif endif
ifeq ($(FULL_TARGET),arm-linux) ifeq ($(FULL_TARGET),arm-linux)
override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc unix override COMPILER_INCLUDEDIR+=$(OS_TARGET) inc unix

2
fcl/Makefile.fpc
View File

@ -55,6 +55,8 @@ includedir_solaris=unix
includedir_qnx=unix includedir_qnx=unix
includedir_beos=unix includedir_beos=unix
includedir_emx=os2 includedir_emx=os2
includedir_win32=win
includedir_win64=win
sourcedir=$(OS_TARGET) inc sourcedir=$(OS_TARGET) inc
[install] [install]

4
fcl/inc/pipes.pp
View File

@ -43,7 +43,7 @@ Type
Function Read (Var Buffer; Count : Longint) : longint; Override; Function Read (Var Buffer; Count : Longint) : longint; Override;
end; end;
Function CreatePipeHandles (Var Inhandle,OutHandle : Longint) : Boolean; Function CreatePipeHandles (Var Inhandle,OutHandle : THandle) : Boolean;
Procedure CreatePipeStreams (Var InPipe : TInputPipeStream; Procedure CreatePipeStreams (Var InPipe : TInputPipeStream;
Var OutPipe : TOutputPipeStream); Var OutPipe : TOutputPipeStream);
@ -60,7 +60,7 @@ Implementation
Procedure CreatePipeStreams (Var InPipe : TInputPipeStream; Procedure CreatePipeStreams (Var InPipe : TInputPipeStream;
Var OutPipe : TOutputPipeStream); Var OutPipe : TOutputPipeStream);
Var InHandle,OutHandle : Longint; Var InHandle,OutHandle : THandle;
begin begin
if CreatePipeHandles (InHandle, OutHandle) then if CreatePipeHandles (InHandle, OutHandle) then

0
fcl/win32/eventlog.inc → fcl/win/eventlog.inc
View File

4
fcl/win32/pipes.inc → fcl/win/pipes.inc
View File

@ -2,7 +2,7 @@
This file is part of the Free Pascal run time library. This file is part of the Free Pascal run time library.
Copyright (c) 1998 by Michael Van Canneyt Copyright (c) 1998 by Michael Van Canneyt
Win32 part of pipe stream. Win part of pipe stream.
See the file COPYING.FPC, included in this distribution, See the file COPYING.FPC, included in this distribution,
for details about the copyright. for details about the copyright.
@ -28,7 +28,7 @@ Const piInheritablePipe : TSecurityAttributes = (
PipeBufSize = 1024; PipeBufSize = 1024;
Function CreatePipeHandles (Var Inhandle,OutHandle : Longint) : Boolean; Function CreatePipeHandles (Var Inhandle,OutHandle : THandle) : Boolean;
begin begin
Result := CreatePipe (@Inhandle,@OutHandle,@piInheritablePipe,PipeBufSize); Result := CreatePipe (@Inhandle,@OutHandle,@piInheritablePipe,PipeBufSize);