ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-09 15:28:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove redundant incs of xxhash - undef cpuid macro before xxhash is

Browse Source 
included, so that we don't have conflicting definitions due to memfun
This commit is contained in:
Ryan Fleury
2026-06-22 13:43:19 -07:00
parent 28d037a924
commit e2430fa23e
6 changed files with 6 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/base/base_strings.c
+3
View File
@@ -3240,12 +3240,15 @@ str8_buffer_write_string_list(String8Node *buf, U64 *pos, String8List list)
//////////////////////////////// ////////////////////////////////
//~ rjf: Basic String Hashes //~ rjf: Basic String Hashes
#pragma push_macro("__cpuid")
#undef __cpuid
#if !defined(XXH_IMPLEMENTATION) #if !defined(XXH_IMPLEMENTATION)
# define XXH_INLINE_ALL # define XXH_INLINE_ALL
# define XXH_IMPLEMENTATION # define XXH_IMPLEMENTATION
# define XXH_STATIC_LINKING_ONLY # define XXH_STATIC_LINKING_ONLY
# include "third_party/xxHash/xxhash.h" # include "third_party/xxHash/xxhash.h"
#endif #endif
#pragma pop_macro("__cpuid")
internal U64 internal U64
u64_hash_from_seed_str8(U64 seed, String8 string) u64_hash_from_seed_str8(U64 seed, String8 string)
src/dbg_engine/dbg_engine_user.c
+1 -14
View File
@@ -7,23 +7,10 @@
//////////////////////////////// ////////////////////////////////
//~ rjf: Basic Helpers //~ 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 internal U64
d_hash_from_string(String8 string) d_hash_from_string(String8 string)
{ {
return d_hash_from_seed_string(5381, string); return u64_hash_from_seed_str8(5381, string);
} }
internal U64 internal U64
src/dbg_engine/dbg_engine_user.h
-1
View File
@@ -391,7 +391,6 @@ global D_UserState *d_user_state = 0;
//////////////////////////////// ////////////////////////////////
//~ rjf: Basic Helpers //~ 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_string(String8 string);
internal U64 d_hash_from_seed_string__case_insensitive(U64 seed, 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); internal U64 d_hash_from_string__case_insensitive(String8 string);
src/eval/eval_core.c
+1 -7
View File
@@ -9,16 +9,10 @@
//////////////////////////////// ////////////////////////////////
//~ rjf: Basic Helpers //~ rjf: Basic Helpers
#if !defined(XXH_IMPLEMENTATION)
# define XXH_IMPLEMENTATION
# define XXH_STATIC_LINKING_ONLY
# include "third_party/xxHash/xxhash.h"
#endif
internal U64 internal U64
e_hash_from_string(U64 seed, String8 string) 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; return result;
} }
src/eval_visualization/eval_visualization_core.c
+1 -7
View File
@@ -13,12 +13,6 @@ EV_EXPAND_RULE_INFO_FUNCTION_DEF(nil)
//////////////////////////////// ////////////////////////////////
//~ rjf: Key Functions //~ 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 internal EV_Key
ev_key_make(U64 parent_hash, U64 child_id) ev_key_make(U64 parent_hash, U64 child_id)
{ {
@@ -54,7 +48,7 @@ ev_key_match(EV_Key a, EV_Key b)
internal U64 internal U64
ev_hash_from_seed_string(U64 seed, String8 string) 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; return result;
} }
src/font_cache/font_cache.c
-6
View File
@@ -4,12 +4,6 @@
//////////////////////////////// ////////////////////////////////
//~ rjf: Basic Functions //~ rjf: Basic Functions
#if !defined(XXH_IMPLEMENTATION)
# define XXH_IMPLEMENTATION
# define XXH_STATIC_LINKING_ONLY
# include "third_party/xxHash/xxhash.h"
#endif
internal U128 internal U128
fnt_hash_from_string(String8 string) fnt_hash_from_string(String8 string)
{ {