From 475cd9926dc45474d74fdb5ce7eda3dce403f077 Mon Sep 17 00:00:00 2001
From: florian <florian@freepascal.org>
Date: Sat, 14 Feb 2009 10:36:12 +0000
Subject: [PATCH] * couple of small haiku fixes by Olivier Coursiere

git-svn-id: trunk@12739 -
---
 packages/fcl-db/Makefile.fpc | 1 +
 packages/pxlib/Makefile.fpc  | 2 ++
 rtl/haiku/Makefile.fpc       | 3 ++-
 rtl/unix/dl.pp               | 6 +++++-
 rtl/unix/sysutils.pp         | 3 ++-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/fcl-db/Makefile.fpc b/packages/fcl-db/Makefile.fpc
index 71e0342f53..48d4415415 100644
--- a/packages/fcl-db/Makefile.fpc
+++ b/packages/fcl-db/Makefile.fpc
@@ -9,6 +9,7 @@ version=2.2.2
 [target]
 dirs=src/sdf src/memds src/sqldb src/base 
 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_freebsd=src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
 dirs_darwin=src/dbase src/sqlite
diff --git a/packages/pxlib/Makefile.fpc b/packages/pxlib/Makefile.fpc
index e7783727a3..249eb69b78 100644
--- a/packages/pxlib/Makefile.fpc
+++ b/packages/pxlib/Makefile.fpc
@@ -8,6 +8,7 @@ version=2.2.2
 
 [target]
 units_beos=pxlib
+units_haiku=pxlib
 units_linux=pxlib
 units_win32=pxlib
 units_darwin=pxlib
@@ -15,6 +16,7 @@ units_freebsd=pxlib
 units_openbsd=pxlib
 units_netbsd=pxlib
 exampledirs_beos=examples
+exampledirs_haiku=examples
 exampledirs_linux=examples
 exampledirs_win32=examples
 exampledirs_darwin=examples
diff --git a/rtl/haiku/Makefile.fpc b/rtl/haiku/Makefile.fpc
index 43b0ceadcf..78aa76a6d6 100644
--- a/rtl/haiku/Makefile.fpc
+++ b/rtl/haiku/Makefile.fpc
@@ -15,7 +15,8 @@ units=system baseunix unixtype ctypes objpas macpas strings \
       cpu mmx getopts heaptrc lineinfo lnfodwrf variants \
       rtlconsts syscall unix unixutil strutils termio initc \
       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
 implicitunits=exeinfo
 
diff --git a/rtl/unix/dl.pp b/rtl/unix/dl.pp
index b8dfb28500..b909d1f011 100644
--- a/rtl/unix/dl.pp
+++ b/rtl/unix/dl.pp
@@ -20,7 +20,11 @@ const
 {$ifdef BSD}   // dlopen is in libc on FreeBSD.
   LibDL = 'c';
 {$else}
-  LibDL = 'dl';
+  {$ifdef HAIKU}
+    LibDL = 'root';
+  {$else}
+    LibDL = 'dl';
+  {$endif}
 {$endif}
 
 {$if defined(linux) and defined(cpuarm)}
diff --git a/rtl/unix/sysutils.pp b/rtl/unix/sysutils.pp
index 495963b4d0..4051967082 100644
--- a/rtl/unix/sysutils.pp
+++ b/rtl/unix/sysutils.pp
@@ -182,7 +182,8 @@ var
   lockres: cint;
 begin
   DoFileLocking:=Handle;
-{$ifndef beos}
+{$ifdef beos}
+{$else}
   if (Handle>=0) then
     begin
 {$ifdef solaris}