summaryrefslogtreecommitdiff
path: root/sal/osl/os2/file.cxx
diff options
context:
space:
mode:
authorIngrid Halama <iha@openoffice.org>2010-01-28 16:29:55 +0100
committerIngrid Halama <iha@openoffice.org>2010-01-28 16:29:55 +0100
commit4d25f2a41929080258462cb53b843c52d084d0c9 (patch)
treee22c6dfac5970f28a0b60c2f28c4d100e28a1e72 /sal/osl/os2/file.cxx
parent837894606a612539ab16f4eb3256b5bc5153f27d (diff)
parenta2cadf4bc167c9a5ad534af03f7960c6ef477c05 (diff)
chartmultiline: merge with DEV300_m70
Diffstat (limited to 'sal/osl/os2/file.cxx')
-rw-r--r--sal/osl/os2/file.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sal/osl/os2/file.cxx b/sal/osl/os2/file.cxx
index e89ce6450bee..f3c1ad015de0 100644
--- a/sal/osl/os2/file.cxx
+++ b/sal/osl/os2/file.cxx
@@ -2343,7 +2343,7 @@ oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle)
# define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) ((__OSL_MSDOS_SUPER_MAGIC != (a).f_type))
#endif /* LINUX */
-#if defined(SOLARIS) || defined(IRIX)
+#if defined(SOLARIS)
# define __OSL_STATFS_STRUCT struct statvfs
# define __OSL_STATFS(dir, sfs) statvfs((dir), (sfs))
# define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_frsize))
@@ -2355,7 +2355,7 @@ oslFileError SAL_CALL osl_syncFile(oslFileHandle Handle)
of the target platforms fix it!!!! */
# define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) (1)
# define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
-#endif /* SOLARIS || IRIX*/
+#endif /* SOLARIS */
# define __OSL_STATFS_INIT(a) (memset(&(a), 0, sizeof(__OSL_STATFS_STRUCT)))