Index: /trunk/src/VBox/Additions/common/VBoxGuest/VBoxDev-haiku.c
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuest/VBoxDev-haiku.c	(revision 43368)
+++ /trunk/src/VBox/Additions/common/VBoxGuest/VBoxDev-haiku.c	(revision 43369)
@@ -129,8 +129,8 @@
 {
     PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)cookie;
-    RTSPINLOCKTMP tmp;
     Log(("VBoxGuestHaikuClose: pSession=%p\n", pSession));
 
-    RTSpinlockAcquireNoInts(g_DevExt.SessionSpinlock, &tmp);
+    /** @todo r=ramshankar: should we really be using the session spinlock here? */
+    RTSpinlockAcquire(g_DevExt.SessionSpinlock);
 
     //XXX: we don't know if it belongs to this session !
@@ -144,5 +144,5 @@
     }
 
-    RTSpinlockReleaseNoInts(g_DevExt.SessionSpinlock, &tmp);
+    RTSpinlockRelease(g_DevExt.SessionSpinlock);
 
     return 0;
@@ -205,5 +205,5 @@
     if (RT_UNLIKELY(len > _1M * 16))
     {
-        dprintf(DRIVER_NAME ": VBoxGuestHaikuIOCtl: bad size %#x; pArg=%p Cmd=%lu.\n", len, data, op);
+        dprintf(DRIVER_NAME ": VBoxGuestHaikuIOCtl: bad size %#x; pArg=%p Cmd=%lu.\n", (unsigned)len, data, op);
         return EINVAL;
     }
@@ -276,5 +276,4 @@
 {
     PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)cookie;
-    RTSPINLOCKTMP tmp;
     status_t err = B_OK;
     //dprintf(DRIVER_NAME "select(,%d,%p)\n", event, sync);
@@ -290,5 +289,5 @@
     }
 
-    RTSpinlockAcquireNoInts(g_DevExt.SessionSpinlock, &tmp);
+    RTSpinlockAcquire(g_DevExt.SessionSpinlock);
 
     uint32_t u32CurSeq = ASMAtomicUoReadU32(&g_DevExt.u32MousePosChangedSeq);
@@ -312,5 +311,5 @@
     }
 
-    RTSpinlockReleaseNoInts(g_DevExt.SessionSpinlock, &tmp);
+    RTSpinlockRelease(g_DevExt.SessionSpinlock);
 
     return err;
@@ -348,9 +347,8 @@
 {
     PVBOXGUESTSESSION pSession = (PVBOXGUESTSESSION)cookie;
-    RTSPINLOCKTMP tmp;
     status_t err = B_OK;
     //dprintf(DRIVER_NAME "deselect(,%d,%p)\n", event, sync);
 
-    RTSpinlockAcquireNoInts(g_DevExt.SessionSpinlock, &tmp);
+    RTSpinlockAcquire(g_DevExt.SessionSpinlock);
 
     if (sState.selectSync == sync)
@@ -364,5 +362,5 @@
         err = B_OK;
 
-    RTSpinlockReleaseNoInts(g_DevExt.SessionSpinlock, &tmp);
+    RTSpinlockRelease(g_DevExt.SessionSpinlock);
     return err;
 }