[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [k3b/2.0] /: Import new NetBSD patches.
From: Johannes Obermayr <johannesobermayr () gmx ! de>
Date: 2014-11-16 22:18:40
Message-ID: E1Xq89Y-0007em-A6 () scm ! kde ! org
[Download RAW message or body]
Git commit 18031aef84df4f975e53a1171a2d6a5048c9869a by Johannes Obermayr, on behalf \
of Mark Davies. Committed on 15/11/2014 at 03:35.
Pushed by jobermayr into branch '2.0'.
Import new NetBSD patches.
CCMAIL: markd@NetBSD.org
M +1 -1 libk3b/jobs/k3bdatatrackreader.cpp
M +4 -4 libk3b/tools/k3bcdparanoialib.cpp
M +4 -4 libk3bdevice/k3bdevice.cpp
M +3 -3 libk3bdevice/k3bdevicemanager.cpp
http://commits.kde.org/k3b/18031aef84df4f975e53a1171a2d6a5048c9869a
diff --git a/libk3b/jobs/k3bdatatrackreader.cpp b/libk3b/jobs/k3bdatatrackreader.cpp
index 7f96f6f..c09abfb 100644
--- a/libk3b/jobs/k3bdatatrackreader.cpp
+++ b/libk3b/jobs/k3bdatatrackreader.cpp
@@ -256,7 +256,7 @@ bool K3b::DataTrackReader::run()
//
d->device->setSpeed( 0xffff, 0xffff );
-#ifdef __NETBSD__
+#ifdef Q_OS_NETBSD
s_bufferSizeSectors = 31;
#else
s_bufferSizeSectors = 128;
diff --git a/libk3b/tools/k3bcdparanoialib.cpp b/libk3b/tools/k3bcdparanoialib.cpp
index e8d05d5..8876e1d 100644
--- a/libk3b/tools/k3bcdparanoialib.cpp
+++ b/libk3b/tools/k3bcdparanoialib.cpp
@@ -68,7 +68,7 @@ typedef short int int16_t;
#define LIBCDIO_CDDA "cdio_cdda.dll"
#define LIBCDIO_PARANOIA "cdio_paranoia.dll"
#else
-#ifdef __NETBSD__
+#ifdef Q_OS_NETBSD
#define CDDA_LIBCDDA_INTERFACE "cdda/libcdda_interace.so"
#define CDDA_LIBCDDA_PARANOIA "cdda/libcdda_paranoia.so"
#define LIBCDDA_INTERFACE "libcdda_interface.so"
@@ -555,7 +555,7 @@ K3b::CdparanoiaLib* K3b::CdparanoiaLib::create()
#ifndef Q_OS_WIN32
if( !s_libInterface ) {
-#ifndef __NETBSD__
+#ifndef Q_OS_NETBSD
s_libInterface = dlopen( LIBCDIO_CDDA_1, RTLD_NOW|RTLD_GLOBAL );
if( !s_libInterface ) {
s_libInterface = dlopen( LIBCDIO_CDDA_0, RTLD_NOW|RTLD_GLOBAL );
@@ -566,7 +566,7 @@ K3b::CdparanoiaLib* K3b::CdparanoiaLib::create()
// try the redhat & Co. location
if( !s_libInterface )
s_libInterface = dlopen( CDDA_LIBCDDA_INTERFACE, \
RTLD_NOW|RTLD_GLOBAL );
-#ifndef __NETBSD__
+#ifndef Q_OS_NETBSD
}
}
#endif
@@ -581,7 +581,7 @@ K3b::CdparanoiaLib* K3b::CdparanoiaLib::create()
#ifndef Q_OS_WIN32
if( s_haveLibCdio ) {
s_libParanoia = dlopen( LIBCDIO_PARANOIA, RTLD_NOW );
-#ifndef __NETBSD__
+#ifndef Q_OS_NETBSD
if( !s_libParanoia ) {
s_libParanoia = dlopen( LIBCDIO_PARANOIA_1, RTLD_NOW );
if( !s_libParanoia )
diff --git a/libk3bdevice/k3bdevice.cpp b/libk3bdevice/k3bdevice.cpp
index 09b1a62..d37edbf 100644
--- a/libk3bdevice/k3bdevice.cpp
+++ b/libk3bdevice/k3bdevice.cpp
@@ -35,7 +35,7 @@
#include <Solid/OpticalDrive>
#include <Solid/Block>
#include <Solid/StorageAccess>
-#ifdef __NETBSD__
+#ifdef Q_OS_NETBSD
#include <Solid/GenericInterface>
#endif
@@ -245,12 +245,12 @@ K3b::Device::Device::Handle K3b::Device::openDevice( const \
char* name, bool writ
K3b::Device::Device::Device( const Solid::Device& dev )
{
-#ifdef __NETBSD__
- const Solid::GenericInterace *gi = dev.as<Solid::GenericInterface>();
+#ifdef Q_OS_NETBSD
+ const Solid::GenericInterface *gi = dev.as<Solid::GenericInterface>();
#endif
d = new Private;
d->solidDevice = dev;
-#ifndef __NETBSD__
+#ifndef Q_OS_NETBSD
d->blockDevice = dev.as<Solid::Block>()->device();
#else
if (gi->propertyExists("block.netbsd.raw_device"))
diff --git a/libk3bdevice/k3bdevicemanager.cpp b/libk3bdevice/k3bdevicemanager.cpp
index dc84df6..0515aa3 100644
--- a/libk3bdevice/k3bdevicemanager.cpp
+++ b/libk3bdevice/k3bdevicemanager.cpp
@@ -39,7 +39,7 @@
#include <Solid/OpticalDrive>
#include <Solid/Block>
#include <Solid/Device>
-#ifdef __NETBSD__
+#ifdef Q_OS_NETBSD
#include <Solid/GenericInterface>
#endif
@@ -359,10 +359,10 @@ bool K3b::Device::DeviceManager::saveConfig( KConfigGroup c )
K3b::Device::Device* K3b::Device::DeviceManager::addDevice( const Solid::Device& \
solidDevice ) {
if( const Solid::Block* blockDevice = solidDevice.as<Solid::Block>() ) {
-#ifndef __NETBSD__
+#ifndef Q_OS_NETBSD
if( !findDevice( blockDevice->device() ) )
#else
- if( !findDevice( \
solidDevice.as<Solid::GenericInterface>()->propertyExists("block.netbsd.raw_device") \
? solidDevice.as<Solid::GenericInterface>()->property("block.netbsd.raw_device").toString() \
: blockDevice->device() ) ); + if( !findDevice( \
solidDevice.as<Solid::GenericInterface>()->propertyExists("block.netbsd.raw_device") \
? solidDevice.as<Solid::GenericInterface>()->property("block.netbsd.raw_device").toString() \
: blockDevice->device() ) ) #endif
return addDevice( new K3b::Device::Device( solidDevice ) );
else
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic