mirror of
https://gitlab.com/freepascal.org/fpc/source.git
synced 2025-08-16 09:59:17 +02:00
* couple of small haiku fixes by Olivier Coursiere
git-svn-id: trunk@12739 -
This commit is contained in:
parent
6c06a902e2
commit
475cd9926d
@ -9,6 +9,7 @@ version=2.2.2
|
|||||||
[target]
|
[target]
|
||||||
dirs=src/sdf src/memds src/sqldb src/base
|
dirs=src/sdf src/memds src/sqldb src/base
|
||||||
dirs_beos=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
|
dirs_beos=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
|
||||||
|
dirs_haiku=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
|
||||||
dirs_linux=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
|
dirs_linux=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
|
||||||
dirs_freebsd=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
|
dirs_freebsd=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
|
||||||
dirs_darwin=src/dbase src/sqlite
|
dirs_darwin=src/dbase src/sqlite
|
||||||
|
@ -8,6 +8,7 @@ version=2.2.2
|
|||||||
|
|
||||||
[target]
|
[target]
|
||||||
units_beos=pxlib
|
units_beos=pxlib
|
||||||
|
units_haiku=pxlib
|
||||||
units_linux=pxlib
|
units_linux=pxlib
|
||||||
units_win32=pxlib
|
units_win32=pxlib
|
||||||
units_darwin=pxlib
|
units_darwin=pxlib
|
||||||
@ -15,6 +16,7 @@ units_freebsd=pxlib
|
|||||||
units_openbsd=pxlib
|
units_openbsd=pxlib
|
||||||
units_netbsd=pxlib
|
units_netbsd=pxlib
|
||||||
exampledirs_beos=examples
|
exampledirs_beos=examples
|
||||||
|
exampledirs_haiku=examples
|
||||||
exampledirs_linux=examples
|
exampledirs_linux=examples
|
||||||
exampledirs_win32=examples
|
exampledirs_win32=examples
|
||||||
exampledirs_darwin=examples
|
exampledirs_darwin=examples
|
||||||
|
@ -15,7 +15,8 @@ units=system baseunix unixtype ctypes objpas macpas strings \
|
|||||||
cpu mmx getopts heaptrc lineinfo lnfodwrf variants \
|
cpu mmx getopts heaptrc lineinfo lnfodwrf variants \
|
||||||
rtlconsts syscall unix unixutil strutils termio initc \
|
rtlconsts syscall unix unixutil strutils termio initc \
|
||||||
cmem crt video mouse keyboard \
|
cmem crt video mouse keyboard \
|
||||||
dateutils fmtbcd sockets dynlibs cwstring cthreads
|
dateutils fmtbcd sockets dynlibs cwstring cthreads \
|
||||||
|
fpintres clocale
|
||||||
rsts=math varutils typinfo variants sysconst rtlconsts dateutils
|
rsts=math varutils typinfo variants sysconst rtlconsts dateutils
|
||||||
implicitunits=exeinfo
|
implicitunits=exeinfo
|
||||||
|
|
||||||
|
@ -20,7 +20,11 @@ const
|
|||||||
{$ifdef BSD} // dlopen is in libc on FreeBSD.
|
{$ifdef BSD} // dlopen is in libc on FreeBSD.
|
||||||
LibDL = 'c';
|
LibDL = 'c';
|
||||||
{$else}
|
{$else}
|
||||||
LibDL = 'dl';
|
{$ifdef HAIKU}
|
||||||
|
LibDL = 'root';
|
||||||
|
{$else}
|
||||||
|
LibDL = 'dl';
|
||||||
|
{$endif}
|
||||||
{$endif}
|
{$endif}
|
||||||
|
|
||||||
{$if defined(linux) and defined(cpuarm)}
|
{$if defined(linux) and defined(cpuarm)}
|
||||||
|
@ -182,7 +182,8 @@ var
|
|||||||
lockres: cint;
|
lockres: cint;
|
||||||
begin
|
begin
|
||||||
DoFileLocking:=Handle;
|
DoFileLocking:=Handle;
|
||||||
{$ifndef beos}
|
{$ifdef beos}
|
||||||
|
{$else}
|
||||||
if (Handle>=0) then
|
if (Handle>=0) then
|
||||||
begin
|
begin
|
||||||
{$ifdef solaris}
|
{$ifdef solaris}
|
||||||
|
Loading…
Reference in New Issue
Block a user