From e2430fa23e32a116bd7ee262f5716162727a59ee Mon Sep 17 00:00:00 2001
From: Ryan Fleury <ryan.j.fleury@gmail.com>
Date: Mon, 22 Jun 2026 13:43:15 -0700
Subject: [PATCH] remove redundant incs of xxhash - undef cpuid macro before
 xxhash is included, so that we don't have conflicting definitions due to
 memfun

---
 src/base/base_strings.c                          |  3 +++
 src/dbg_engine/dbg_engine_user.c                 | 15 +--------------
 src/dbg_engine/dbg_engine_user.h                 |  1 -
 src/eval/eval_core.c                             |  8 +-------
 src/eval_visualization/eval_visualization_core.c |  8 +-------
 src/font_cache/font_cache.c                      |  6 ------
 6 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/src/base/base_strings.c b/src/base/base_strings.c
index c5d5a717..da8a85f6 100644
--- a/src/base/base_strings.c
+++ b/src/base/base_strings.c
@@ -3240,12 +3240,15 @@ str8_buffer_write_string_list(String8Node *buf, U64 *pos, String8List list)
 ////////////////////////////////
 //~ rjf: Basic String Hashes
 
+#pragma push_macro("__cpuid")
+#undef __cpuid
 #if !defined(XXH_IMPLEMENTATION)
 # define XXH_INLINE_ALL
 # define XXH_IMPLEMENTATION
 # define XXH_STATIC_LINKING_ONLY
 # include "third_party/xxHash/xxhash.h"
 #endif
+#pragma pop_macro("__cpuid")
 
 internal U64
 u64_hash_from_seed_str8(U64 seed, String8 string)
diff --git a/src/dbg_engine/dbg_engine_user.c b/src/dbg_engine/dbg_engine_user.c
index 0130afc1..bafedc75 100644
--- a/src/dbg_engine/dbg_engine_user.c
+++ b/src/dbg_engine/dbg_engine_user.c
@@ -7,23 +7,10 @@
 ////////////////////////////////
 //~ rjf: Basic Helpers
 
-#if !defined(XXH_IMPLEMENTATION)
-# define XXH_IMPLEMENTATION
-# define XXH_STATIC_LINKING_ONLY
-# include "third_party/xxHash/xxhash.h"
-#endif
-
-internal U64
-d_hash_from_seed_string(U64 seed, String8 string)
-{
-  U64 result = XXH3_64bits_withSeed(string.str, string.size, seed);
-  return result;
-}
-
 internal U64
 d_hash_from_string(String8 string)
 {
-  return d_hash_from_seed_string(5381, string);
+  return u64_hash_from_seed_str8(5381, string);
 }
 
 internal U64
diff --git a/src/dbg_engine/dbg_engine_user.h b/src/dbg_engine/dbg_engine_user.h
index af29c05d..2a81e8a8 100644
--- a/src/dbg_engine/dbg_engine_user.h
+++ b/src/dbg_engine/dbg_engine_user.h
@@ -391,7 +391,6 @@ global D_UserState *d_user_state = 0;
 ////////////////////////////////
 //~ rjf: Basic Helpers
 
-internal U64 d_hash_from_seed_string(U64 seed, String8 string);
 internal U64 d_hash_from_string(String8 string);
 internal U64 d_hash_from_seed_string__case_insensitive(U64 seed, String8 string);
 internal U64 d_hash_from_string__case_insensitive(String8 string);
diff --git a/src/eval/eval_core.c b/src/eval/eval_core.c
index 30dea758..c8d19db4 100644
--- a/src/eval/eval_core.c
+++ b/src/eval/eval_core.c
@@ -9,16 +9,10 @@
 ////////////////////////////////
 //~ rjf: Basic Helpers
 
-#if !defined(XXH_IMPLEMENTATION)
-# define XXH_IMPLEMENTATION
-# define XXH_STATIC_LINKING_ONLY
-# include "third_party/xxHash/xxhash.h"
-#endif
-
 internal U64
 e_hash_from_string(U64 seed, String8 string)
 {
-  U64 result = XXH3_64bits_withSeed(string.str, string.size, seed);
+  U64 result = u64_hash_from_seed_str8(seed, string);
   return result;
 }
 
diff --git a/src/eval_visualization/eval_visualization_core.c b/src/eval_visualization/eval_visualization_core.c
index 8c5eb508..23cd64e3 100644
--- a/src/eval_visualization/eval_visualization_core.c
+++ b/src/eval_visualization/eval_visualization_core.c
@@ -13,12 +13,6 @@ EV_EXPAND_RULE_INFO_FUNCTION_DEF(nil)
 ////////////////////////////////
 //~ rjf: Key Functions
 
-#if !defined(XXH_IMPLEMENTATION)
-# define XXH_IMPLEMENTATION
-# define XXH_STATIC_LINKING_ONLY
-# include "third_party/xxHash/xxhash.h"
-#endif
-
 internal EV_Key
 ev_key_make(U64 parent_hash, U64 child_id)
 {
@@ -54,7 +48,7 @@ ev_key_match(EV_Key a, EV_Key b)
 internal U64
 ev_hash_from_seed_string(U64 seed, String8 string)
 {
-  U64 result = XXH3_64bits_withSeed(string.str, string.size, seed);
+  U64 result = u64_hash_from_seed_str8(seed, string);
   return result;
 }
 
diff --git a/src/font_cache/font_cache.c b/src/font_cache/font_cache.c
index 7b9fba5e..c84cb17b 100644
--- a/src/font_cache/font_cache.c
+++ b/src/font_cache/font_cache.c
@@ -4,12 +4,6 @@
 ////////////////////////////////
 //~ rjf: Basic Functions
 
-#if !defined(XXH_IMPLEMENTATION)
-# define XXH_IMPLEMENTATION
-# define XXH_STATIC_LINKING_ONLY
-# include "third_party/xxHash/xxhash.h"
-#endif
-
 internal U128
 fnt_hash_from_string(String8 string)
 {