Changeset 50362 in vbox

Timestamp:

Feb 7, 2014 1:20:55 PM (11 years ago)

Author:

vboxsync

Message:

src/libs/xpcom: repair VBOX_DEBUG_LIFETIMES

Location:

trunk/src/libs/xpcom18a4/python/src

Files:

• PyISupports.cpp (modified) (4 diffs)
• PyXPCOM.h (modified) (1 diff)

trunk/src/libs/xpcom18a4/python/src/PyISupports.cpp

@@ -60 +60 @@
 /*static*/ RTCRITSECT        Py_nsISupports::g_CritSect;
 
-/*static*/ DECLCALLBACK(int)
-Py_nsISupports::initOnceCallback(void *pvUser1, void *pvUser2)
-{
-    NOREF(pvUser1); NOREF(pvUser2);
+/*static*/ DECLCALLBACK(int32_t)
+Py_nsISupports::initOnceCallback(void *pvUser1)
+{
+    NOREF(pvUser1);
     RTListInit(&g_List);
     return RTCritSectInit(&g_CritSect);
@@ -71 +71 @@
 Py_nsISupports::dumpList(void)
 {
-    RTOnce(&g_Once, initOnceCallback, NULL, NULL);
+    RTOnce(&g_Once, initOnceCallback, NULL);
     RTCritSectEnter(&g_CritSect);
 
@@ -89 +89 @@
 Py_nsISupports::dumpListToStdOut()
 {
-    RTOnce(&g_Once, initOnceCallback, NULL, NULL);
+    RTOnce(&g_Once, initOnceCallback, NULL);
     RTCritSectEnter(&g_CritSect);
 
@@ -140 +140 @@
 
 #ifdef VBOX_DEBUG_LIFETIMES
-        RTOnce(&g_Once, initOnceCallback, NULL, NULL);
+        RTOnce(&g_Once, initOnceCallback, NULL);
         RTCritSectEnter(&g_CritSect);
         RTListAppend(&g_List, &m_ListEntry);

trunk/src/libs/xpcom18a4/python/src/PyXPCOM.h

@@ -377 +377 @@
 
 #ifdef VBOX_DEBUG_LIFETIMES
-        static DECLCALLBACK(int) initOnceCallback(void *pvUser1, void *pvUser2);
+        static DECLCALLBACK(int32_t) initOnceCallback(void *pvUser1);
 
         RTLISTNODE              m_ListEntry; /**< List entry. */