diff options
| author | Robert Nagy <robert@openbsd.org> | 2010-11-04 09:25:04 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2010-11-04 09:25:04 +0100 |
| commit | 7659ad44e3e1c955400c77dc1d45cc481faf55bf (patch) | |
| tree | 28911f518f908174f06667beac94992caec05667 /sal/inc | |
| parent | e456a0804052a0ad0a4daef4fad9c5205bd7aa60 (diff) | |
Patches for ure, neeed by OpenBSD
Adds the necessary distinctions in the system abstraction layers.
Diffstat (limited to 'sal/inc')
| -rw-r--r-- | sal/inc/osl/endian.h | 6 | ||||
| -rw-r--r-- | sal/inc/rtl/uuid.h | 2 | ||||
| -rw-r--r-- | sal/inc/sal/alloca.h | 2 | ||||
| -rw-r--r-- | sal/inc/sal/config.h | 3 | ||||
| -rw-r--r-- | sal/inc/sal/types.h | 4 |
5 files changed, 11 insertions, 6 deletions
diff --git a/sal/inc/osl/endian.h b/sal/inc/osl/endian.h index 9314c7fcfe5e..c9004bdab642 100644 --- a/sal/inc/osl/endian.h +++ b/sal/inc/osl/endian.h @@ -154,9 +154,9 @@ extern "C" { /** Check supported platform. */ -#if !defined(_WIN32) && !defined(_WIN16) && !defined(OS2) && \ - !defined(LINUX) && !defined(NETBSD) && !defined(SCO) && \ - !defined(AIX) && !defined(HPUX) && \ +#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) # error "Target platform not specified !" #endif diff --git a/sal/inc/rtl/uuid.h b/sal/inc/rtl/uuid.h index fa3883989231..d17c328fe638 100644 --- a/sal/inc/rtl/uuid.h +++ b/sal/inc/rtl/uuid.h @@ -201,6 +201,8 @@ void SAL_CALL rtl_createNamedUuid( #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 100000 #elif AIX #define UUID_SYSTEM_TIME_RESOLUTION_100NS_TICKS 10 +#elif OPENBSD +#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 8e1dec305b1f..0580a1faa42f 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) +#elif defined (FREEBSD) || defined(NETBSD) || defined(OPENBSD) #ifndef INCLUDED_STDLIB_H #include <stdlib.h> diff --git a/sal/inc/sal/config.h b/sal/inc/sal/config.h index cd4e10b71a56..9cdf2ac3fd18 100644 --- a/sal/inc/sal/config.h +++ b/sal/inc/sal/config.h @@ -92,7 +92,8 @@ #define SAL_SYSCONFIGFILE( name ) name ".ini" #endif -#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || defined(SCO) || defined(AIX) +#if defined(SOLARIS) || defined(LINUX) || defined(NETBSD) || defined(FREEBSD) || \ + defined(SCO) || defined(AIX) || defined(OPENBSD) #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 36b45009667a..9fac15ad319e 100644 --- a/sal/inc/sal/types.h +++ b/sal/inc/sal/types.h @@ -345,7 +345,9 @@ typedef struct _sal_Sequence lack RTTI support, dynamic_cast is not included here). */ #ifdef __cplusplus -#if defined SAL_W32 || defined SOLARIS || defined LINUX || defined MACOSX || defined FREEBSD || defined NETBSD || defined AIX || defined OS2 +#if defined SAL_W32 || defined SOLARIS || defined LINUX || defined MACOSX || \ + defined FREEBSD || defined NETBSD || defined AIX || defined OS2 || \ + defined OPENBSD #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)) |