diff --git a/server/TracyPopcnt.hpp b/server/TracyPopcnt.hpp
index a84008d5..e6c4539d 100644
--- a/server/TracyPopcnt.hpp
+++ b/server/TracyPopcnt.hpp
@@ -7,9 +7,12 @@
 #  include <intrin.h>
 #  define TracyCountBits __popcnt64
 #elif defined __GNUC__ || defined __clang__
-#  define TracyCountBits __builtin_popcountll
+static inline uint64_t TracyCountBits( uint64_t i )
+{
+    return uint64_t( __builtin_popcountll( i ) );
+}
 #else
-static inline int TracyCountBits( uint64_t i )
+static inline uint64_t TracyCountBits( uint64_t i )
 {
     i = i - ( (i >> 1) & 0x5555555555555555 );
     i = ( i & 0x3333333333333333 ) + ( (i >> 2) & 0x3333333333333333 );