diff options
| author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 13:47:42 +0000 |
|---|---|---|
| committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2003-08-18 13:47:42 +0000 |
| commit | 978857d628cc695abc8586a0304bfa0a83e7fb07 (patch) | |
| tree | 49f3443b21ef3ee8126e422ea5c0ce381cf0381b /store | |
| parent | 5a83c131c9ef4188662c08fbd3c059cea18c6c53 (diff) | |
INTEGRATION: CWS geordi2q01 (1.2.24); FILE MERGED
2003/08/18 13:31:29 hr 1.2.24.1: #i18350#: join changes from CWS ooo11rc3
Diffstat (limited to 'store')
| -rw-r--r-- | store/source/fileunx.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/store/source/fileunx.hxx b/store/source/fileunx.hxx index 556cf55eee1e..b89e09cd9b25 100644 --- a/store/source/fileunx.hxx +++ b/store/source/fileunx.hxx @@ -2,9 +2,9 @@ * * $RCSfile: fileunx.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2003-03-27 14:06:33 $ + * last change: $Author: hjs $ $Date: 2003-08-18 14:47:42 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,9 +72,9 @@ #include <sys/stat.h> #include <sys/types.h> -#if defined(FREEBSD) || defined(NETBSD) +#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX) #define EDEADLOCK EDEADLK -#endif /* FREEBSD || NETBSD */ +#endif /* FREEBSD || NETBSD || MACOSX */ typedef int HSTORE; @@ -111,7 +111,7 @@ inline sal_Int32 __store_errno (void) /* * __store_malign. */ -#if defined(FREEBSD) || defined(LINUX) +#if defined(FREEBSD) || defined(LINUX) || defined(MACOSX) inline sal_uInt32 __store_malign (void) { return (sal_uInt32)::getpagesize(); @@ -126,7 +126,7 @@ inline sal_uInt32 __store_malign (void) { return (sal_uInt32)(-1); } -#endif /* FREEBSD || IRIX || LINUX || SOLARIS */ +#endif /* FREEBSD || IRIX || LINUX || SOLARIS || MACOSX*/ /* * __store_fmap (readonly). |