Changeset 4697 in vbox

Timestamp:

Sep 11, 2007 11:13:15 AM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

24360

Message:

Force R3 context for DECLCALLBACKMEMBER & DECLCALLBACKPTR

Location:

trunk

Files:

• include/iprt/cdefs.h (modified) (2 diffs)
• src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp (modified) (1 diff)

trunk/include/iprt/cdefs.h

@@ -489 +489 @@
  * @param   name    The name of the variable member.
  */
-#define DECLCALLBACKPTR(type, name)  type (RTCALL * name)
+#ifdef IN_RING3
+# define DECLCALLBACKPTR(type, name)  type (RTCALL * name)
+#else
+# define DECLCALLBACKPTR(type, name)  RTR3PTR name
+#endif
 
 /** @def DECLCALLBACKMEMBER
@@ -496 +500 @@
  * @param   name    The name of the struct/union/class member.
  */
-#define DECLCALLBACKMEMBER(type, name)  type (RTCALL * name)
+#ifdef IN_RING3
+# define DECLCALLBACKMEMBER(type, name)  type (RTCALL * name)
+#else
+# define DECLCALLBACKMEMBER(type, name)  RTR3PTR name
+#endif
 
 /** @def DECLR3CALLBACKMEMBER

trunk/src/VBox/VMM/VMMGC/TRPMGCHandlers.cpp

@@ -75 +75 @@
      * @param   uUser           The user argument.
      */
-    DECLCALLBACKMEMBER(int, pfnHandler)(PVM pVM, PCPUMCTXCORE pRegFrame, uintptr_t uUser);
+    DECLGCCALLBACKMEMBER(int, pfnHandler, (PVM pVM, PCPUMCTXCORE pRegFrame, uintptr_t uUser));
     /** Whatever the handler desires to put here. */
     uintptr_t uUser;