Changeset 91803 in vbox for trunk/src/VBox/HostDrivers

Timestamp:

Oct 18, 2021 7:36:51 AM (3 years ago)

Author:

vboxsync

Message:

SUPDrv: Mangling fix. bugref:10124

File:

• trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp (modified) (1 diff)

trunk/src/VBox/HostDrivers/Support/SUPDrv.cpp

@@ -206 +206 @@
  *       with function pointer arguments (probably noexcept related).
  * @{ */
-#define SUPEXP_CUSTOM(a_cArgs, a_Name, a_Value) { #a_Name,      a_cArgs,                            (void *)(uintptr_t)(a_Value) }
-#define SUPEXP_STK_OKAY(a_cArgs, a_Name)        { #a_Name,      SUPEXP_CHECK_ARGS(a_cArgs, a_Name), (void *)(uintptr_t)a_Name }
+#define SUPEXP_CUSTOM(a_cArgs, a_Name, a_Value) { #a_Name,       a_cArgs,                            (void *)(uintptr_t)(a_Value) }
+#define SUPEXP_STK_OKAY(a_cArgs, a_Name)        { #a_Name,       SUPEXP_CHECK_ARGS(a_cArgs, a_Name), (void *)(uintptr_t)a_Name }
 #ifdef RT_OS_DARWIN
-# define SUPEXP_STK_BACK(a_cArgs, a_Name) { "StkBack_" #a_Name, SUPEXP_CHECK_ARGS(a_cArgs, a_Name), (void *)(uintptr_t)a_Name }
+# define SUPEXP_STK_BACK(a_cArgs, a_Name)  { "StkBack_" #a_Name, SUPEXP_CHECK_ARGS(a_cArgs, a_Name), (void *)(uintptr_t)a_Name }
+# define SUPEXP_STK_BACKF(a_cArgs, a_Name) { "StkBack_" #a_Name, SUPEXP_CHECK_ARGS(a_cArgs, a_Name), (void *)(uintptr_t)a_Name }
 #else
-# define SUPEXP_STK_BACK(a_cArgs, a_Name)       { #a_Name,      SUPEXP_CHECK_ARGS(a_cArgs, a_Name), (void *)(uintptr_t)a_Name }
+# define SUPEXP_STK_BACK(a_cArgs, a_Name)       { #a_Name,       SUPEXP_CHECK_ARGS(a_cArgs, a_Name), (void *)(uintptr_t)a_Name }
 # ifdef _MSC_VER
-#  define SUPEXP_STK_BACKF(a_cArgs, a_Name)     { #a_Name,      a_cArgs,                            (void *)(uintptr_t)a_Name }
+#  define SUPEXP_STK_BACKF(a_cArgs, a_Name)     { #a_Name,       a_cArgs,                            (void *)(uintptr_t)a_Name }
+# else
+#  define SUPEXP_STK_BACK(a_cArgs, a_Name)      { #a_Name,       SUPEXP_CHECK_ARGS(a_cArgs, a_Name), (void *)(uintptr_t)a_Name }
 # endif
-#endif
-#ifndef SUPEXP_STK_BACKF
-# define SUPEXP_STK_BACKF(a_cArgs, a_Name)      SUPEXP_STK_BACK(a_cArgs, a_Name)
 #endif
 /** @} */