hrev50297 adds 1 changeset to branch 'master'
old head: 5559d51db7a1ac4f2f87531a6efd213eadcb5831
new head: 88445a43e8dbd3f8b60e77d4da136a3e7bccfb29
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=88445a43e8db+%5E5559d51db7a1
----------------------------------------------------------------------------
88445a43e8db: bluetooth_server: Attempt to fix the x86_64 build.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev50297
Commit: 88445a43e8dbd3f8b60e77d4da136a3e7bccfb29
URL: http://cgit.haiku-os.org/haiku/commit/?id=88445a43e8db
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Sun May 8 02:00:46 2016 UTC
----------------------------------------------------------------------------
2 files changed, 6 insertions(+), 7 deletions(-)
src/servers/bluetooth/BluetoothServer.cpp | 11 +++++------
src/servers/bluetooth/LocalDeviceImpl.cpp | 2 +-
----------------------------------------------------------------------------
diff --git a/src/servers/bluetooth/BluetoothServer.cpp
b/src/servers/bluetooth/BluetoothServer.cpp
index b6865b1..c8b0110 100644
--- a/src/servers/bluetooth/BluetoothServer.cpp
+++ b/src/servers/bluetooth/BluetoothServer.cpp
@@ -124,8 +124,7 @@ void BluetoothServer::ReadyToRun(void)
#define _USE_FAKE_SDP_SERVER
#ifdef _USE_FAKE_SDP_SERVER
if (fSDPThreadID <= 0 || resume_thread(fSDPThreadID) != B_OK) {
- TRACE_BT("BluetoothServer: Failed launching the SDP server
thread: %lx\n",
- fSDPThreadID);
+ TRACE_BT("BluetoothServer: Failed launching the SDP server
thread\n");
}
#endif
}
@@ -159,7 +158,7 @@ void BluetoothServer::MessageReceived(BMessage* message)
if (lDeviceImpl->GetID() >= 0) {
fLocalDevicesList.AddItem(lDeviceImpl);
- TRACE_BT("LocalDevice %s id=%lx added\n",
str.String(),
+ TRACE_BT("LocalDevice %s id=%" B_PRId32 "
added\n", str.String(),
lDeviceImpl->GetID());
} else {
TRACE_BT("BluetoothServer: Adding LocalDevice
hci id invalid\n");
@@ -320,7 +319,7 @@ BluetoothServer::HandleAcquireLocalDevice(BMessage*
message, BMessage* reply)
if (lDeviceImpl != NULL && lDeviceImpl->Available()) {
printf("Requested local device %" B_PRId32 "\n",
lDeviceImpl->GetID());
- TRACE_BT("BluetoothServer: Device available:
%lx\n", lDeviceImpl->GetID());
+ TRACE_BT("BluetoothServer: Device available: %"
B_PRId32 "\n", lDeviceImpl->GetID());
lastIndex = index;
break;
}
@@ -333,7 +332,7 @@ BluetoothServer::HandleAcquireLocalDevice(BMessage*
message, BMessage* reply)
if (lDeviceImpl != NULL &&
lDeviceImpl->Available()) {
printf("Requested local device %"
B_PRId32 "\n",
lDeviceImpl->GetID());
- TRACE_BT("BluetoothServer: Device
available: %lx\n", lDeviceImpl->GetID());
+ TRACE_BT("BluetoothServer: Device
available: %" B_PRId32 "\n", lDeviceImpl->GetID());
lastIndex = index;
break;
}
@@ -347,7 +346,7 @@ BluetoothServer::HandleAcquireLocalDevice(BMessage*
message, BMessage* reply)
hid = lDeviceImpl->GetID();
lDeviceImpl->Acquire();
- TRACE_BT("BluetoothServer: Device acquired %lx\n", hid);
+ TRACE_BT("BluetoothServer: Device acquired %" B_PRId32 "\n",
hid);
return reply->AddInt32("hci_id", hid);
}
diff --git a/src/servers/bluetooth/LocalDeviceImpl.cpp
b/src/servers/bluetooth/LocalDeviceImpl.cpp
index f8ec8f7..a077def 100644
--- a/src/servers/bluetooth/LocalDeviceImpl.cpp
+++ b/src/servers/bluetooth/LocalDeviceImpl.cpp
@@ -84,7 +84,7 @@ LocalDeviceImpl::Unregister()
msg->AddInt32("hci_id", fHCIDelegate->Id());
- TRACE_BT("LocalDeviceImpl: Unregistering %lx\n",
+ TRACE_BT("LocalDeviceImpl: Unregistering %" B_PRId32 "\n",
fHCIDelegate->Id());
be_app_messenger.SendMessage(msg);
