diff options
| author | OBATA Akio <obache@wizdas.com> | 2019-04-06 16:49:26 +0900 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2019-08-18 15:36:50 +0200 |
| commit | 4741832142e091d641fb8a90607b4595accb905d (patch) | |
| tree | 31f31b6389635adc523c7a33f873a9562e1adadb /tdeioslave/media | |
| parent | 0aaebc24cd00c9dd833c16dd14d1814948baac38 (diff) | |
| download | tdebase-4741832142e091d641fb8a90607b4595accb905d.tar.gz tdebase-4741832142e091d641fb8a90607b4595accb905d.zip | |
Revive NetBSD support
Catch up to TDE and OS changes
Signed-off-by: OBATA Akio <obache@wizdas.com>
(cherry picked from commit 2a88ec3c02ab46c8b816cfa348ea53075f57a59c)
Diffstat (limited to 'tdeioslave/media')
| -rw-r--r-- | tdeioslave/media/mediamanager/fstabbackend.cpp | 6 | ||||
| -rw-r--r-- | tdeioslave/media/mediamanager/fstabbackend.h | 4 | ||||
| -rw-r--r-- | tdeioslave/media/medianotifier/medianotifier.cpp | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/tdeioslave/media/mediamanager/fstabbackend.cpp b/tdeioslave/media/mediamanager/fstabbackend.cpp index 84910352d..fb891254c 100644 --- a/tdeioslave/media/mediamanager/fstabbackend.cpp +++ b/tdeioslave/media/mediamanager/fstabbackend.cpp @@ -69,7 +69,7 @@ FstabBackend::FstabBackend(MediaList &list, bool networkSharesOnly) KDirWatch::self()->startScan(); -#ifdef Q_OS_FREEBSD +#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) connect( &m_mtabTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( handleMtabChange() ) ); m_mtabTimer.start(250); @@ -170,7 +170,7 @@ bool inExclusionPattern(KMountPoint *mount, bool networkSharesOnly) void FstabBackend::handleMtabChange(bool allowNotification) { TQStringList new_mtabIds; - KMountPoint::List mtab = KMountPoint::currentMountPoints(); + KMountPoint::List mtab = KMountPoint::currentMountPoints(KMountPoint::NeedRealDeviceName); KMountPoint::List::iterator it = mtab.begin(); KMountPoint::List::iterator end = mtab.end(); @@ -409,6 +409,8 @@ void FstabBackend::guess(const TQString &devNode, const TQString &mountPoint, || devNode.find("/dev/scd")!=-1 || devNode.find("/dev/sr")!=-1 // FREEBSD SPECIFIC || devNode.find("/acd")!=-1 || devNode.find("/scd")!=-1 + // NETBSD SPECIFIC + || devNode.find("/cd")!=-1 || devNode.find("/cd")!=-1 ) { mimeType = "media/cdrom"; diff --git a/tdeioslave/media/mediamanager/fstabbackend.h b/tdeioslave/media/mediamanager/fstabbackend.h index e43ed48c0..c27dd7029 100644 --- a/tdeioslave/media/mediamanager/fstabbackend.h +++ b/tdeioslave/media/mediamanager/fstabbackend.h @@ -25,7 +25,7 @@ #include <tqstringlist.h> #include <tqmap.h> -#ifdef Q_OS_FREEBSD +#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) #include <tqtimer.h> #endif @@ -60,7 +60,7 @@ private: TQStringList m_mtabIds; TQMap<TQString, TQString> m_mtabEntries; TQStringList m_fstabIds; -#ifdef Q_OS_FREEBSD +#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) TQTimer m_mtabTimer; #endif }; diff --git a/tdeioslave/media/medianotifier/medianotifier.cpp b/tdeioslave/media/medianotifier/medianotifier.cpp index d40c5ae27..88f58af2d 100644 --- a/tdeioslave/media/medianotifier/medianotifier.cpp +++ b/tdeioslave/media/medianotifier/medianotifier.cpp @@ -19,13 +19,16 @@ #include "medianotifier.h" -#if defined (__OpenBSD__) || defined(__FreeBSD__) +#if defined (__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) #include <sys/statvfs.h> #include <sys/param.h> #include <sys/mount.h> #else #include <sys/vfs.h> #endif +#if defined(__NetBSD__) +#define statfs statvfs +#endif #include <tqfile.h> #include <tqfileinfo.h> |