[Libreoffice-commits] .: sal/osl sal/workben

[François Tigeot]

 sal/osl/unx/file_error_transl.cxx |    2 +-
 sal/osl/unx/process.c             |    2 +-
 sal/osl/unx/system.h              |    1 +
 sal/workben/makefile.mk           |    3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 0a31a21fc49df237337e7dc6d2dfccfae9e41283
Author: Francois Tigeot <ftigeot at wolfpond.org>
Date:   Sun Feb 27 14:15:26 2011 +0100

    Handle DragonFly like the other BSDs in more cases.

diff --git a/sal/osl/unx/file_error_transl.cxx b/sal/osl/unx/file_error_transl.cxx
index d3e23c1..b7b334d 100644
--- a/sal/osl/unx/file_error_transl.cxx
+++ b/sal/osl/unx/file_error_transl.cxx
@@ -217,7 +217,7 @@ oslFileError oslTranslateFileError(sal_Bool bIsError, int Errno)
             osl_error = osl_File_E_LOOP;
             break;
 
-#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD))
+#if !(defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY))
         case EILSEQ:
             osl_error = osl_File_E_ILSEQ;
             break;
diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c
index 63dc7cb..d21b1b7 100644
--- a/sal/osl/unx/process.c
+++ b/sal/osl/unx/process.c
@@ -42,7 +42,7 @@
 #endif
 
 
-#if defined(FREEBSD) || defined(NETBSD)
+#if defined(FREEBSD) || defined(NETBSD) || defined(DRAGONFLY)
 #include <machine/param.h>
 #endif
 
diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h
index 7909ca4..14ba945 100644
--- a/sal/osl/unx/system.h
+++ b/sal/osl/unx/system.h
@@ -242,6 +242,7 @@
 #   include <netinet/tcp.h>
 #   include <machine/endian.h>
 #   define  IORESOURCE_TRANSFER_BSD
+#   define  IOCHANNEL_TRANSFER_BSD_RENO
 #endif
 
 #ifdef AIX
diff --git a/sal/workben/makefile.mk b/sal/workben/makefile.mk
index 30454c3..5a036dc 100644
--- a/sal/workben/makefile.mk
+++ b/sal/workben/makefile.mk
@@ -102,7 +102,8 @@ APP4DEPN=$(SLB)$/sal.lib
 #
 # tgetpwnam
 #
-.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD"
+.IF "$(OS)"=="NETBSD" || "$(OS)"=="FREEBSD" || "$(OS)"=="OPENBSD" || \
+    "$(OS)"=="DRAGONFLY"
 OBJFILES+=\
     $(OBJ)$/tgetpwnam.obj