summaryrefslogtreecommitdiffstats
path: root/utilities
diff options
context:
space:
mode:
Diffstat (limited to 'utilities')
-rw-r--r--utilities/smb4k_umount.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/utilities/smb4k_umount.cpp b/utilities/smb4k_umount.cpp
index 23eb266..0fea963 100644
--- a/utilities/smb4k_umount.cpp
+++ b/utilities/smb4k_umount.cpp
@@ -27,9 +27,9 @@
#include <config.h>
#endif
-#if !defined(__FreeBSD__) && !defined(__solaris__) && !defined(USE_SOLARIS)
+#if !defined(__FreeBSD__) && !defined(__sun)
#include <sys/statfs.h>
-#elif defined(__solaris__) || defined(USE_SOLARIS)
+#elif defined(__sun)
#include <sys/types.h>
#include <sys/statvfs.h>
#elif defined(__FreeBSD__)
@@ -138,13 +138,13 @@ bool check_filesystem( const char *path, const char *fs )
{
bool ok = false;
-#if !defined(__solaris__) && !defined(USE_SOLARIS)
+#if !defined(__sun)
struct statfs filesystem;
#else
struct statvfs filesystem;
#endif
-#if !defined(__solaris__) && !defined(USE_SOLARIS) && !defined(__irix__)
+#if !defined(__sun) && !defined(__irix__)
if ( statfs( path, &filesystem ) == -1 )
#elif defined(__irix__)
if ( statfs( path, &filesystem, sizeof( filesystem ), 0 ) == -1 )
@@ -168,7 +168,7 @@ bool check_filesystem( const char *path, const char *fs )
return ok;
}
-#if !defined(__FreeBSD__) && !defined(__solaris__) && !defined(USE_SOLARIS) && !defined(__irix__)
+#if !defined(__FreeBSD__) && !defined(__sun) && !defined(__irix__)
// First entry is for CIFS, the second for SMBFS.
if ( (uint)filesystem.f_type == 0xFF534D42 && !strncmp( fs, "cifs", strlen( fs )+1 ) )
{
@@ -183,7 +183,7 @@ bool check_filesystem( const char *path, const char *fs )
{
ok = true;
}
-#elif defined(__solaris__) || defined(USE_SOLARIS)
+#elif defined(__sun)
if ( (uint)filesystem.f_basetype == 0xFF534D42 && !strncmp( fs, "cifs", strlen( fs )+1 ) )
{
ok = true;