[Libreoffice-commits] core.git: sal/osl

Riccardo Magliocchetti riccardo.magliocchetti at gmail.com
Thu Oct 30 07:13:48 PDT 2014


 sal/osl/unx/file_volume.cxx |   11 -----------
 1 file changed, 11 deletions(-)

New commits:
commit 9eed0d4854623d28caf2c4d3bcdd6803db488475
Author: Riccardo Magliocchetti <riccardo.magliocchetti at gmail.com>
Date:   Thu Oct 30 12:20:15 2014 +0100

    osl/unx: Remove ifdefery for ancient NetBSD < 3.0
    
    Change-Id: I808da98a3b825eb2213dbcb6d435baa58bf54a9d
    Reviewed-on: https://gerrit.libreoffice.org/12151
    Reviewed-by: Bryan Quigley <gquigs at gmail.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sal/osl/unx/file_volume.cxx b/sal/osl/unx/file_volume.cxx
index ce036fc..c200217 100644
--- a/sal/osl/unx/file_volume.cxx
+++ b/sal/osl/unx/file_volume.cxx
@@ -156,21 +156,10 @@ oslFileError osl_getVolumeInformation( rtl_uString* ustrDirectoryURL, oslVolumeI
 
 #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)
 


More information about the Libreoffice-commits mailing list