diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2022-01-16 23:49:20 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2022-01-18 10:29:42 +0900 |
| commit | 497297648c372682f600e6399c7b1399bebba254 (patch) | |
| tree | 36090c3183b37aecbb00bd3219541fa410143614 /smb4k | |
| parent | b0e1c02a68fae80db2f17e140af0d072c0ddd0a7 (diff) | |
| download | smb4k-497297648c372682f600e6399c7b1399bebba254.tar.gz smb4k-497297648c372682f600e6399c7b1399bebba254.zip | |
Replaced USE_SOLARIS definition with __sun.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'smb4k')
| -rw-r--r-- | smb4k/core/smb4kmounter.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/smb4k/core/smb4kmounter.cpp b/smb4k/core/smb4kmounter.cpp index 68eccaf..5091898 100644 --- a/smb4k/core/smb4kmounter.cpp +++ b/smb4k/core/smb4kmounter.cpp @@ -37,9 +37,9 @@ #include <kdebug.h> // system includes -#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/statvfs.h> #elif defined(__FreeBSD__) #include <sys/param.h> @@ -1046,13 +1046,13 @@ void Smb4KMounter::processMount() TQString name = TQString( "//%1/%2" ).arg( m_priv->host() ).arg( m_priv->share() ); // Check file system -#if !defined(__solaris__) +#if !defined(__sun) struct statfs filesystem; #else struct statvfs filesystem; #endif -#if !defined(__solaris__) && !defined(__irix__) +#if !defined(__sun) && !defined(__irix__) if ( statfs( m_priv->path(), &filesystem ) == -1 ) #elif defined(__irix__) if ( statfs( m_priv->path(), &filesystem, sizeof( filesystem ), 0 ) == -1 ) @@ -1079,7 +1079,7 @@ void Smb4KMounter::processMount() } else { -#if !defined(__FreeBSD__) && !defined(__solaris__) && !defined(__irix__) +#if !defined(__FreeBSD__) && !defined(__sun) && !defined(__irix__) if ( (uint)filesystem.f_type == 0xFF534D42 /* CIFS */) { // The user name will be send if no login was specified. @@ -1095,7 +1095,7 @@ void Smb4KMounter::processMount() share = new Smb4KShare( name, m_priv->path(), "smbfs", (int)getuid(), (int)getgid() ); m_mounted_shares.append( share ); } -#elif defined(__solaris__) +#elif defined(__sun) if ( (uint)filesystem.f_basetype == 0xFF534D42 /* CIFS */) { // The user name will be send if no login was specified. |