From f091f5b395cc462a01a52aa7b535202e8b232463 Mon Sep 17 00:00:00 2001 From: Francois Tigeot Date: Tue, 15 Feb 2011 12:15:27 +0000 Subject: dragonfly stuff --- bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 2 +- bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx | 6 ++++-- bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk | 7 ++++--- bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx | 8 +++++--- bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk | 7 ++++--- bridges/source/cpp_uno/shared/vtablefactory.cxx | 2 +- cppu/source/uno/data.cxx | 2 +- cppu/util/makefile.mk | 2 +- idlc/source/idlccompile.cxx | 2 +- pyuno/source/module/makefile.mk | 2 ++ sal/inc/osl/endian.h | 3 ++- sal/inc/rtl/uuid.h | 2 ++ sal/inc/sal/alloca.h | 2 +- sal/inc/sal/config.h | 2 +- sal/inc/sal/types.h | 2 +- sal/osl/unx/backtrace.c | 2 +- sal/osl/unx/backtrace.h | 5 +++-- sal/osl/unx/file.cxx | 2 +- sal/osl/unx/file_volume.cxx | 14 +++++++------- sal/osl/unx/makefile.mk | 4 ++-- sal/osl/unx/nlsupport.c | 13 +++++++------ sal/osl/unx/process.c | 2 +- sal/osl/unx/socket.c | 4 ++-- sal/osl/unx/system.h | 20 +++++++++++++++++++- sal/osl/unx/time.c | 2 +- sal/qa/osl/file/osl_File_Const.h | 2 +- sal/rtl/source/alloc_arena.c | 2 +- sal/rtl/source/macro.hxx | 2 ++ 28 files changed, 79 insertions(+), 46 deletions(-) diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx index adcae90cb755..c21fb7672bc3 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx @@ -39,7 +39,7 @@ /*See: http://people.redhat.com/drepper/selinux-mem.html*/ #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \ - || defined(NETBSD) + || defined(NETBSD) || defined(DRAGONFLY) #define USE_DOUBLE_MMAP #endif diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx index 84c05578bf5b..3f91c558f1d0 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/cpp2uno.cxx @@ -359,7 +359,8 @@ extern "C" typedef void (*PrivateSnippetExecutor)(); int const codeSnippetSize = 16; -#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) +#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) || \ + defined(DRAGONFLY) namespace { PrivateSnippetExecutor returnsInRegister(typelib_TypeDescriptionReference * pReturnTypeRef) @@ -407,7 +408,8 @@ unsigned char * codeSnippet( break; case typelib_TypeClass_STRUCT: case typelib_TypeClass_EXCEPTION: -#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) +#if defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) || \ + defined(DRAGONFLY) exec = returnsInRegister(pReturnTypeRef); if (!exec) { diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk index 6e2b7529247f..beedf9dafa2a 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk +++ b/bridges/source/cpp_uno/gcc3_linux_intel/makefile.mk @@ -39,9 +39,10 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- .IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXIgcc3" || \ - "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCOPENBSDIgcc3" || \ - "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3" || \ - "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDIgcc3" + "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCOPENBSDIgcc3" || \ + "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDIgcc3" || \ + "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDIgcc3" || \ + "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCDRAGONFLYIgcc3" .IF "$(cppu_no_leak)" == "" CFLAGS += -DLEAK_STATIC_DATA diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx index de3e28ea8269..21febefad110 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/uno2cpp.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_bridges.hxx" -#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) +#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) #include #else #include @@ -153,7 +153,8 @@ void callVirtualMethod( break; default: { -#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) +#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) || \ + defined(DRAGONFLY) sal_Int32 const nRetSize = pReturnTypeDescr->nSize; if (bSimpleReturn && nRetSize <= 8 && nRetSize > 0) { @@ -355,7 +356,8 @@ namespace x86 { if (bridges::cpp_uno::shared::isSimpleType( pTD )) return true; -#if defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(MACOSX) +#if defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD) || \ + defined(MACOSX) || defined(DRAGONFLY) // Only structs of exactly 1, 2, 4, or 8 bytes are returned through // registers, see : diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk index 156ca4f27d4a..c7617f2ac8cd 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/makefile.mk @@ -39,9 +39,10 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------- .IF "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCLINUXXgcc3" || \ - "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCOPENBSDXgcc3" || \ - "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDXgcc3" || \ - "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDXgcc3" + "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCOPENBSDXgcc3" || \ + "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCFREEBSDXgcc3" || \ + "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCNETBSDXgcc3" || \ + "$(COM)$(OS)$(CPU)$(COMNAME)" == "GCCDRAGONFLYXgcc3" || \ .IF "$(cppu_no_leak)" == "" CFLAGS += -DLEAK_STATIC_DATA diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 64cf4735bd2e..11cc6878e474 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -83,7 +83,7 @@ namespace { extern "C" void * SAL_CALL allocExec(rtl_arena_type *, sal_Size * size) { sal_Size pagesize; #if defined SAL_UNX -#if defined FREEBSD || defined NETBSD || defined OPENBSD +#if defined FREEBSD || defined NETBSD || defined OPENBSD || defined DRAGONFLY pagesize = getpagesize(); #else pagesize = sysconf(_SC_PAGESIZE); diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index edc908a020a5..ea0b8b2ad6b6 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -361,7 +361,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData( #if defined(INTEL) \ && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(OS2) \ - || defined(NETBSD) || defined(OPENBSD)) || defined(MACOSX) \ + || defined(NETBSD) || defined(OPENBSD)) || defined(MACOSX) || defined(DRAGONFLY) \ || defined(__SUNPRO_CC) && defined(SOLARIS)) #define MAX_ALIGNMENT_4 #endif diff --git a/cppu/util/makefile.mk b/cppu/util/makefile.mk index 47a3c9abb743..8d1003bd4de6 100644 --- a/cppu/util/makefile.mk +++ b/cppu/util/makefile.mk @@ -60,7 +60,7 @@ SHL1STDLIBS = $(SALLIB) SHL1DEPN= SHL1IMPLIB=i$(TARGET) -.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" +.IF "$(OS)"!="FREEBSD" && "$(OS)"!="NETBSD" && "$(OS)"!="OPENBSD" && "$(OS)"!="DRAGONFLY" SHL1DEF=$(MISC)$/$(SHL1TARGET).def .ENDIF diff --git a/idlc/source/idlccompile.cxx b/idlc/source/idlccompile.cxx index 2af8168e18a0..9bc69b148f1c 100644 --- a/idlc/source/idlccompile.cxx +++ b/idlc/source/idlccompile.cxx @@ -44,7 +44,7 @@ #include #include #if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || \ - defined(AIX) || defined(OPENBSD) + defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY) #include #else #include diff --git a/pyuno/source/module/makefile.mk b/pyuno/source/module/makefile.mk index 06f9b4262d15..5afc85b0d5a3 100644 --- a/pyuno/source/module/makefile.mk +++ b/pyuno/source/module/makefile.mk @@ -146,6 +146,8 @@ $(PYUNO_MODULE) : $(SLO)$/pyuno_dlopenwrapper.obj @echo $(LINK) $(LINKFLAGSSHLCUI) -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELIF "$(OS)" == "OPENBSD" @echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd +.ELIF "$(OS)" == "DRAGONFLY" + @echo ld -shared -o $@ $(SLO)$/pyuno_dlopenwrapper.o > $(MISC)$/$(@:b).cmd .ELIF "$(OS)" == "MACOSX" @echo $(CC) -bundle -ldl -o $@ $(SLO)$/pyuno_dlopenwrapper.o $(EXTRA_LINKFLAGS) $(EXTRA_FRAMEWORK_FLAG) > $(MISC)$/$(@:b).cmd .ELSE diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h index 7eb0094d36db..aecf7dd84580 100644 --- a/sal/inc/osl/endian.h +++ b/sal/inc/osl/endian.h @@ -159,7 +159,8 @@ extern "C" { #if !defined(_WIN32) && !defined(_WIN16) && !defined(OS2) && \ !defined(LINUX) && !defined(NETBSD) && !defined(SCO) && \ !defined(AIX) && !defined(HPUX) && !defined(OPENBSD) && \ - !defined(SOLARIS) && !defined(MACOSX) && !defined(FREEBSD) + !defined(SOLARIS) && !defined(MACOSX) && !defined(FREEBSD) && \ + !defined(DRAGONFLY) # error "Target platform not specified !" #endif diff --git a/sal/inc/rtl/uuid.h b/sal/inc/rtl/uuid.h index d17c328fe638..a74fa416393c 100644 --- a/sal/inc/rtl/uuid.h +++ b/sal/inc/rtl/uuid.h @@ -203,6 +203,8 @@ void SAL_CALL rtl_createNamedUuid( #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10 #elif OPENBSD #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10 +#elif DRAGONFLY +#define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10 #else #error "System time resolution must be calculated!" #endif diff --git a/sal/inc/sal/alloca.h b/sal/inc/sal/alloca.h index 0580a1faa42f..f1001bde0321 100644 --- a/sal/inc/sal/alloca.h +++ b/sal/inc/sal/alloca.h @@ -36,7 +36,7 @@ #define INCLUDED_ALLOCA_H #endif -#elif defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) +#elif defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) #ifndef INCLUDED_STDLIB_H #include diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h index 9cdf2ac3fd18..d1ef84114f90 100644 --- a/sal/inc/sal/config.h +++ b/sal/inc/sal/config.h @@ -93,7 +93,7 @@ #endif #if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || \ - defined(SCO) || defined(AIX) || defined(OPENBSD) + defined(SCO) || defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY) #define SAL_UNX #define SAL_DLLEXTENSION ".so" #define SAL_DLLPREFIX "lib" diff --git a/sal/inc/sal/types.h b/sal/inc/sal/types.h index 07ae0cfa049b..2f25749f7d4a 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -351,7 +351,7 @@ typedef struct _sal_Sequence #ifdef __cplusplus #if defined SAL_W32 || defined SOLARIS || defined LINUX || defined MACOSX || \ defined FREEBSD || defined NETBSD || defined AIX || defined OS2 || \ - defined OPENBSD + defined OPENBSD || defined DRAGONFLY #define SAL_CONST_CAST(type, expr) (const_cast< type >(expr)) #define SAL_REINTERPRET_CAST(type, expr) (reinterpret_cast< type >(expr)) #define SAL_STATIC_CAST(type, expr) (static_cast< type >(expr)) diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c index 7d3c0c55c3f9..d5e4e94afaa4 100644 --- a/sal/osl/unx/backtrace.c +++ b/sal/osl/unx/backtrace.c @@ -140,7 +140,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd ) #endif /* defined SOLARIS */ -#if defined FREEBSD || defined NETBSD || defined OPENBSD +#if defined FREEBSD || defined NETBSD || defined OPENBSD || defined(DRAGONFLY) #include #include #include diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h index da7fed51dc56..79fb58025e2e 100644 --- a/sal/osl/unx/backtrace.h +++ b/sal/osl/unx/backtrace.h @@ -28,7 +28,7 @@ #if defined (SOLARIS) || defined (FREEBSD) || defined (NETBSD) || \ - defined (OPENBSD) + defined (OPENBSD) || defined (DRAGONFLY) #ifdef __cplusplus extern "C" { @@ -41,7 +41,8 @@ int backtrace( void **buffer, int max_frames ); void backtrace_symbols_fd( void **buffer, int size, int fd ); /* no frame.h on FreeBSD */ -#if defined (FREEBSD) || defined (NETBSD) || defined (OPENBSD) +#if defined (FREEBSD) || defined (NETBSD) || defined (OPENBSD) || \ + defined (DRAGONFLY) struct frame { long arg0[8]; long arg1[6]; diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx index c18960f4d872..ae8b161893da 100644 --- a/sal/osl/unx/file.cxx +++ b/sal/osl/unx/file.cxx @@ -273,7 +273,7 @@ void FileHandle_Impl::operator delete (void * p, size_t) size_t FileHandle_Impl::getpagesize() { #if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) || \ - defined(OPENBSD) + defined(OPENBSD) || defined(DRAGONFLY) return sal::static_int_cast< size_t >(::getpagesize()); #else /* POSIX */ return sal::static_int_cast< size_t >(::sysconf(_SC_PAGESIZE)); diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx index bc3812839979..46a9715b2ffc 100644 --- a/sal/osl/unx/file_volume.cxx +++ b/sal/osl/unx/file_volume.cxx @@ -70,7 +70,7 @@ static const sal_Char* MOUNTTAB="/etc/mnttab"; #include static const sal_Char* MOUNTTAB="/etc/mtab"; -#elif defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) +#elif defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) #include #include @@ -180,7 +180,7 @@ oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeI #ifdef HAVE_STATFS_H -#if defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) +#if defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) || defined(DRAGONFLY) # define __OSL_STATFS_STRUCT struct statfs # define __OSL_STATFS(dir, sfs) statfs((dir), (sfs)) # define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize)) @@ -1123,7 +1123,7 @@ osl_isFloppyMounted (oslVolumeDeviceHandleImpl* pDevice) *****************************************************************************/ #if (defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || \ - defined(AIX) || defined(OPENBSD)) + defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY)) static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath) { (void)pszPath; @@ -1132,7 +1132,7 @@ static oslVolumeDeviceHandle osl_isFloppyDrive(const sal_Char* pszPath) #endif /* MACOSX */ #if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || \ - defined(AIX) || defined(OPENBSD)) + defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY)) static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy) { (void)hFloppy; @@ -1141,7 +1141,7 @@ static oslFileError osl_mountFloppy(oslVolumeDeviceHandle hFloppy) #endif /* MACOSX */ #if ( defined(MACOSX) || defined(NETBSD) || defined(FREEBSD) || \ - defined(AIX) || defined(OPENBSD)) + defined(AIX) || defined(OPENBSD) || defined(DRAGONFLY)) static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy) { (void)hFloppy; @@ -1149,14 +1149,14 @@ static oslFileError osl_unmountFloppy(oslVolumeDeviceHandle hFloppy) } #endif /* MACOSX */ -#if ( defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) ) +#if ( defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) ) static sal_Bool osl_getFloppyMountEntry(const sal_Char* pszPath, oslVolumeDeviceHandleImpl* pItem) { return sal_False; } #endif /* NETBSD || FREEBSD || OPENBSD */ -#if ( defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) ) +#if ( defined(NETBSD) || defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) ) static sal_Bool osl_isFloppyMounted(oslVolumeDeviceHandleImpl* pDevice) { return sal_False; diff --git a/sal/osl/unx/makefile.mk b/sal/osl/unx/makefile.mk index 117609a38d40..31bdf9927e36 100644 --- a/sal/osl/unx/makefile.mk +++ b/sal/osl/unx/makefile.mk @@ -115,8 +115,8 @@ SLOFILES += $(SLO)$/osxlocale.obj .ENDIF .IF "$(OS)"=="SOLARIS" || "$(OS)"=="FREEBSD" || "$(OS)"=="NETBSD" || \ - "$(OS)$(CPU)"=="LINUXS" || "$(OS)"=="MACOSX" || \ - "$(OS)"=="AIX" || "$(OS)"=="OPENBSD" + "$(OS)$(CPU)"=="LINUXS" || "$(OS)"=="MACOSX" || "$(OS)"=="AIX" || \ + "$(OS)"=="OPENBSD" || "$(OS)"=="DRAGONFLY" SLOFILES += $(SLO)$/backtrace.obj OBJFILES += $(OBJ)$/backtrace.obj .ENDIF diff --git a/sal/osl/unx/nlsupport.c b/sal/osl/unx/nlsupport.c index f78aa92c25dd..543e499a00a1 100644 --- a/sal/osl/unx/nlsupport.c +++ b/sal/osl/unx/nlsupport.c @@ -32,7 +32,8 @@ #include #if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || \ - defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) + defined(FREEBSD) || defined(MACOSX) || defined(OPENBSD) || \ + defined(DRAGONFLY) #include #ifndef MACOSX #include @@ -234,7 +235,7 @@ static rtl_Locale * _parse_locale( const char * locale ) } #if defined(LINUX) || defined(SOLARIS) || defined(NETBSD) || \ - defined(FREEBSD) || defined(OPENBSD) + defined(FREEBSD) || defined(OPENBSD) || defined(DRAGONFLY) /* * This implementation of osl_getTextEncodingFromLocale maps @@ -486,7 +487,7 @@ const _pair _nl_language_list[] = { { "WIN-SAMI-2", RTL_TEXTENCODING_DONTKNOW } /* WS2 */ }; -#elif defined(FREEBSD) +#elif defined(FREEBSD) || defined(DRAGONFLY) const _pair _nl_language_list[] = { { "ASCII", RTL_TEXTENCODING_ASCII_US }, /* US-ASCII */ @@ -952,7 +953,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale ) /* only change env vars that exist already */ if( getenv( "LC_ALL" ) ) { #if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || \ - defined( AIX ) || defined( OPENBSD ) + defined( AIX ) || defined( OPENBSD ) || defined( DRAGONFLY ) setenv( "LC_ALL", locale_buf, 1); #else setenv( "LC_ALL", locale_buf ); @@ -961,7 +962,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale ) if( getenv( "LC_CTYPE" ) ) { #if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || \ - defined( AIX ) || defined( OPENBSD ) + defined( AIX ) || defined( OPENBSD ) || defined( DRAGONFLY ) setenv("LC_CTYPE", locale_buf, 1 ); #else setenv( "LC_CTYPE", locale_buf ); @@ -970,7 +971,7 @@ int _imp_setProcessLocale( rtl_Locale * pLocale ) if( getenv( "LANG" ) ) { #if defined( FREEBSD ) || defined( NETBSD ) || defined( MACOSX ) || \ - defined( AIX ) || defined( OPENBSD) + defined( AIX ) || defined( OPENBSD) || defined( DRAGONFLY ) setenv("LC_CTYPE", locale_buf, 1 ); #else setenv( "LANG", locale_buf ); diff --git a/sal/osl/unx/process.c b/sal/osl/unx/process.c index 5a94380f0020..7a4bdb8785c3 100644 --- a/sal/osl/unx/process.c +++ b/sal/osl/unx/process.c @@ -476,7 +476,7 @@ static void ChildStatusProc(void *pData) if (! INIT_GROUPS(data.m_name, data.m_gid) || (setuid(data.m_uid) != 0)) OSL_TRACE("Failed to change uid and guid, errno=%d (%s)\n", errno, strerror(errno)); -#if defined(LINUX) || defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) +#if defined(LINUX) || defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) || defined(DRAGONFLY) unsetenv("HOME"); #else putenv("HOME="); diff --git a/sal/osl/unx/socket.c b/sal/osl/unx/socket.c index 8377e2d1296a..3d7779f18ffb 100644 --- a/sal/osl/unx/socket.c +++ b/sal/osl/unx/socket.c @@ -47,7 +47,7 @@ #endif #if defined(LINUX) || defined(NETBSD) || defined ( FREEBSD ) || \ - defined (MACOSX) || defined (OPENBSD) + defined (MACOSX) || defined (OPENBSD) || defined(DRAGONFLY) #include #define HAVE_POLL_H #endif /* HAVE_POLL_H */ @@ -785,7 +785,7 @@ static struct hostent* _osl_gethostbyname_r ( const char *name, struct hostent *result, char *buffer, int buflen, int *h_errnop) { -#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103)) +#if defined(LINUX) || (defined(FREEBSD) && (__FreeBSD_version >= 601103)) || defined(DRAGONFLY) struct hostent *__result; /* will be the same as result */ int __error; __error = gethostbyname_r (name, result, buffer, buflen, diff --git a/sal/osl/unx/system.h b/sal/osl/unx/system.h index 3a61f67aec40..e2a3853f5ec6 100644 --- a/sal/osl/unx/system.h +++ b/sal/osl/unx/system.h @@ -226,6 +226,24 @@ # define PTHREAD_SIGACTION pthread_sigaction #endif +#ifdef DRAGONFLY +# define ETIME ETIMEDOUT +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# include +# define IORESOURCE_TRANSFER_BSD +#endif + #ifdef SCO # define AF_IPX -1 # include @@ -376,7 +394,7 @@ int macxp_resolveAlias(char *path, int buflen); !defined(LINUX) && !defined(NETBSD) && !defined(FREEBSD) && !defined(SCO) && \ !defined(AIX) && !defined(HPUX) && \ !defined(SOLARIS) && !defined(MACOSX) && \ - !defined(OPENBSD) + !defined(OPENBSD) && !defined(DRAGONFLY) # error "Target platform not specified!" #endif diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c index bc0931bd4ce5..31530be2195f 100644 --- a/sal/osl/unx/time.c +++ b/sal/osl/unx/time.c @@ -34,7 +34,7 @@ /* FIXME: detection should be done in configure script */ #if defined(MACOSX) || defined(FREEBSD) || defined(NETBSD) || \ - defined(LINUX) || defined(OPENBSD) + defined(LINUX) || defined(OPENBSD) || defined(DRAGONFLY) #define STRUCT_TM_HAS_GMTOFF 1 #elif defined(SOLARIS) diff --git a/sal/qa/osl/file/osl_File_Const.h b/sal/qa/osl/file/osl_File_Const.h index ddb185abf245..1c06944bc113 100644 --- a/sal/qa/osl/file/osl_File_Const.h +++ b/sal/qa/osl/file/osl_File_Const.h @@ -89,7 +89,7 @@ const sal_Char pBuffer_Blank[] = ""; # include # include # include -# if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) +# if !defined(MACOSX) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined (DRAGONFLY) # include # else # include diff --git a/sal/rtl/source/alloc_arena.c b/sal/rtl/source/alloc_arena.c index c782ccf43b63..6766cf91e18d 100644 --- a/sal/rtl/source/alloc_arena.c +++ b/sal/rtl/source/alloc_arena.c @@ -1254,7 +1254,7 @@ static sal_Size rtl_machdep_pagesize (void) { #if defined(SAL_UNX) -#if defined(FREEBSD) || defined(NETBSD) +#if defined(FREEBSD) || defined(NETBSD) || defined(DRAGONFLY) return ((sal_Size)getpagesize()); #else /* POSIX */ return ((sal_Size)sysconf(_SC_PAGESIZE)); diff --git a/sal/rtl/source/macro.hxx b/sal/rtl/source/macro.hxx index bb86b7d9ae39..822fdd1ef2d5 100644 --- a/sal/rtl/source/macro.hxx +++ b/sal/rtl/source/macro.hxx @@ -55,6 +55,8 @@ #define THIS_OS "AIX" #elif defined OPENBSD #define THIS_OS "OpenBSD" +#elif defined DRAGONFLY +#define THIS_OS "DragonFly" #endif #if ! defined THIS_OS -- cgit