From 31727dd6e79dc5de14da698878f6f43d1aaaaba7 Mon Sep 17 00:00:00 2001
From: Abdelrahman Said <said.abdelrahman89@gmail.com>
Date: Mon, 15 Dec 2025 23:40:03 +0000
Subject: [PATCH] Update va_arg_count C++ utility to support MSVC

---
 src/common/misc/misc_utils.h | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/common/misc/misc_utils.h b/src/common/misc/misc_utils.h
index 27c0074..690e41d 100644
--- a/src/common/misc/misc_utils.h
+++ b/src/common/misc/misc_utils.h
@@ -39,18 +39,13 @@ BEGIN_C_LINKAGE
 )
 
 #ifdef WAPP_PLATFORM_CPP
-#define wapp_misc_utils_va_args_count(T, ...) va_args_count<T>(__VA_ARGS__)
+END_C_LINKAGE
+
+#include <tuple>
+
+#define wapp_misc_utils_va_args_count(T, ...) (std::tuple_size<decltype(std::make_tuple(__VA_ARGS__))>::value)
 #else
 #define wapp_misc_utils_va_args_count(T, ...) (sizeof((T[]){__VA_ARGS__})/sizeof(T))
 #endif // !WAPP_PLATFORM_CPP
 
-#ifdef WAPP_PLATFORM_CPP
-END_C_LINKAGE
-
-template <typename T, typename... Args>
-constexpr u64 va_args_count(Args&&...) {
-    return sizeof...(Args);
-}
-#endif // !WAPP_PLATFORM_CPP
-
 #endif // !MISC_UTILS_H