summaryrefslogtreecommitdiff
path: root/misc/openoffice/patches/patch-as
diff options
context:
space:
mode:
Diffstat (limited to 'misc/openoffice/patches/patch-as')
-rw-r--r--misc/openoffice/patches/patch-as46
1 files changed, 0 insertions, 46 deletions
diff --git a/misc/openoffice/patches/patch-as b/misc/openoffice/patches/patch-as
deleted file mode 100644
index 5380f43cecc..00000000000
--- a/misc/openoffice/patches/patch-as
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-as,v 1.5 2005/09/06 08:10:58 abs Exp $
-
---- ../sal/osl/unx/file.c.orig 2004-05-07 09:57:55.000000000 +0200
-+++ ../sal/osl/unx/file.c
-@@ -1193,7 +1193,7 @@ oslFileError SAL_CALL osl_syncFile(oslFi
-
- #ifdef HAVE_STATFS_H
-
--#if defined(FREEBSD) || defined(NETBSD) || defined(MACOSX)
-+#if defined(FREEBSD) || defined(MACOSX)
- # define __OSL_STATFS_STRUCT struct statfs
- # define __OSL_STATFS(dir, sfs) statfs((dir), (sfs))
- # define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize))
-@@ -1207,6 +1207,32 @@ oslFileError SAL_CALL osl_syncFile(oslFi
- # define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (1)
- #endif /* FREEBSD || NETBSD */
-
-+#if defined(NETBSD)
-+
-+#include <sys/param.h>
-+
-+/* statvfs() replaced statfs() in 2.99.9 */
-+# if __NetBSD_Version__ >= 299000900
-+ /* 2.0D or later */
-+# define __OSL_STATFS_STRUCT struct statvfs
-+# define __OSL_STATFS(dir, sfs) statvfs((dir), (sfs))
-+# define __OSL_STATFS_ISREMOTE(a) (((a).f_flag & ST_LOCAL) == 0)
-+
-+# else
-+ /* version before 2.0D */
-+# define __OSL_STATFS_STRUCT struct statfs
-+# define __OSL_STATFS(dir, sfs) statfs((dir), (sfs))
-+# define __OSL_STATFS_ISREMOTE(a) (((a).f_type & MNT_LOCAL) == 0)
-+
-+# endif /* >2.0D */
-+
-+# define __OSL_STATFS_BLKSIZ(a) ((sal_uInt64)((a).f_bsize))
-+# define __OSL_STATFS_TYPENAME(a) ((a).f_fstypename)
-+
-+# define __OSL_STATFS_IS_CASE_SENSITIVE_FS(a) (strcmp((a).f_fstypename, "msdos") != 0 && strcmp((a).f_fstypename, "ntfs") != 0 && strcmp((a).f_fstypename, "smbfs") != 0)
-+# define __OSL_STATFS_IS_CASE_PRESERVING_FS(a) (strcmp((a).f_fstypename, "msdos") != 0)
-+#endif
-+
- #if defined(LINUX)
- # define __OSL_NFS_SUPER_MAGIC 0x6969
- # define __OSL_SMB_SUPER_MAGIC 0x517B