diff options
author | Francois Tigeot <ftigeot@wolfpond.org> | 2011-02-15 12:12:14 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-02-15 15:52:04 +0000 |
commit | c787fcbf1e698bbb15bed9997a8b58382b5857d0 (patch) | |
tree | 3a7414faabecdffdcab934a336dc7d92ae401a34 /tools | |
parent | 659279c8def8141e6f6da4d580dfb0c7624affa4 (diff) |
dragonfly stuff
Diffstat (limited to 'tools')
-rw-r--r-- | tools/bootstrp/command.cxx | 3 | ||||
-rw-r--r-- | tools/inc/tools/inetdef.hxx | 4 | ||||
-rw-r--r-- | tools/inc/tools/prex.h | 4 | ||||
-rw-r--r-- | tools/inc/tools/solar.h | 2 | ||||
-rw-r--r-- | tools/source/fsys/unx.cxx | 8 | ||||
-rw-r--r-- | tools/source/stream/strmunx.cxx | 10 |
6 files changed, 21 insertions, 10 deletions
diff --git a/tools/bootstrp/command.cxx b/tools/bootstrp/command.cxx index 1b81486c31b8..08764627dff5 100644 --- a/tools/bootstrp/command.cxx +++ b/tools/bootstrp/command.cxx @@ -73,7 +73,8 @@ #include <sys/types.h> #include <unistd.h> #if ( defined NETBSD ) || defined (FREEBSD) || defined (AIX) \ - || defined (HPUX) || defined (MACOSX) || defined (OPENBSD) + || defined (HPUX) || defined (MACOSX) || defined (OPENBSD) \ + || defined(DRAGONFLY) #include <sys/wait.h> #else #include <wait.h> diff --git a/tools/inc/tools/inetdef.hxx b/tools/inc/tools/inetdef.hxx index 06bc4e7ab78c..ca2e085306c5 100644 --- a/tools/inc/tools/inetdef.hxx +++ b/tools/inc/tools/inetdef.hxx @@ -63,6 +63,10 @@ #define TOOLS_INETDEF_OS "OpenBSD/i386" #elif defined OPENBSD && defined X86_64 #define TOOLS_INETDEF_OS "OpenBSD/amd64" +#elif defined DRAGONFLY && defined X86 +#define TOOLS_INETDEF_OS "DragonFly/i386" +#elif defined DRAGONFLY && defined X86_64 +#define TOOLS_INETDEF_OS "DragonFly/amd64" #elif defined SINIX #define TOOLS_INETDEF_OS "SINIX" #else // AIX, HPUX, SOLARIS, ... diff --git a/tools/inc/tools/prex.h b/tools/inc/tools/prex.h index 6a13f88f53e6..bed32750929c 100644 --- a/tools/inc/tools/prex.h +++ b/tools/inc/tools/prex.h @@ -48,7 +48,9 @@ extern "C" { #endif -#if defined(LINUX) || defined(FREEBSD) || defined(MACOSX) || defined(NETBSD) || defined(OPENBSD) // should really check for xfree86 or for X11R6.1 and higher +// FIXME: should really check for xfree86 or for X11R6.1 and higher +#if defined(LINUX) || defined(FREEBSD) || defined(MACOSX) || defined(NETBSD) || \ + defined(OPENBSD) || defined(DRAGONFLY) #define __XKeyboardExtension__ 1 #else #define __XKeyboardExtension__ 0 diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h index bf42b96e84a0..13df4e9b0755 100644 --- a/tools/inc/tools/solar.h +++ b/tools/inc/tools/solar.h @@ -339,6 +339,8 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); } #define __DLLEXTENSION "mxi.dylib" #elif defined OPENBSD #define __DLLEXTENSION "ob.so" +#elif defined DRAGONFLY + #define __DLLEXTENSION "df.so" #else #error unknown plattform #endif diff --git a/tools/source/fsys/unx.cxx b/tools/source/fsys/unx.cxx index 2c025e5b6622..5d5811d1e155 100644 --- a/tools/source/fsys/unx.cxx +++ b/tools/source/fsys/unx.cxx @@ -45,8 +45,8 @@ extern "C" int mntctl( int cmd, size_t size, char* buf ); #elif defined(NETBSD) #include <sys/mount.h> -#elif defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) -#elif defined DECUNIX +#elif defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) || \ + defined(DECUNIX) || defined(DRAGONFLY) struct mnttab { char *mnt_dir; @@ -92,7 +92,7 @@ struct mymnttab #if defined(NETBSD) || defined(FREEBSD) || defined(MACOSX) || \ - defined(OPENBSD) + defined(OPENBSD) || defined(DRAGONFLY) BOOL GetMountEntry(dev_t /* dev */, struct mymnttab * /* mytab */ ) { DBG_WARNING( "Sorry, not implemented: GetMountEntry" ); @@ -218,7 +218,7 @@ BOOL DirEntry::IsCaseSensitive( FSysPathStyle eFormatter ) const if (eFormatter==FSYS_STYLE_HOST) { -#ifdef NETBSD +#if defined(NETBSD) || defined(DRAGONFLY) return TRUE; #else struct stat buf; diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx index b138cd469ee3..74fddf2b8b31 100644 --- a/tools/source/stream/strmunx.cxx +++ b/tools/source/stream/strmunx.cxx @@ -210,8 +210,9 @@ static sal_uInt32 GetSvError( int nErrno ) { 0, SVSTREAM_OK }, { EACCES, SVSTREAM_ACCESS_DENIED }, { EBADF, SVSTREAM_INVALID_HANDLE }, -#if defined( RS6000 ) || defined( ALPHA ) || defined( NETBSD ) || defined(FREEBSD) || defined(MACOSX) || \ - defined(OPENBSD) || defined(__FreeBSD_kernel__) || defined ( AIX ) +#if defined(RS6000) || defined(ALPHA) || defined(NETBSD) || \ + defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) || \ + defined(__FreeBSD_kernel__) || defined (AIX) || defined(DRAGONFLY) { EDEADLK, SVSTREAM_LOCKING_VIOLATION }, #else { EDEADLOCK, SVSTREAM_LOCKING_VIOLATION }, @@ -225,8 +226,9 @@ static sal_uInt32 GetSvError( int nErrno ) { EAGAIN, SVSTREAM_LOCKING_VIOLATION }, { EISDIR, SVSTREAM_PATH_NOT_FOUND }, { ELOOP, SVSTREAM_PATH_NOT_FOUND }, -#if ! defined( RS6000 ) && ! defined( ALPHA ) && ! defined( NETBSD ) && ! defined (FREEBSD) && ! defined (MACOSX) && \ - !defined(OPENBSD) && ! defined(__FreeBSD_kernel__) +#if !defined(RS6000) && !defined(ALPHA) && !defined(NETBSD) && !defined (FREEBSD) && \ + !defined(MACOSX) && !defined(OPENBSD) && !defined(__FreeBSD_kernel__) && \ + !defined(DRAGONFLY) { EMULTIHOP, SVSTREAM_PATH_NOT_FOUND }, { ENOLINK, SVSTREAM_PATH_NOT_FOUND }, #endif |