mirror of
https://github.com/DarkPlacesEngine/gmqcc.git
synced 2025-04-13 13:32:46 +00:00
For now I'll just disable this
This commit is contained in:
parent
3e576bd1f3
commit
beaba494b5
2 changed files with 8 additions and 2 deletions
5
Makefile
5
Makefile
|
@ -17,7 +17,8 @@ ifeq ($(CC), clang)
|
|||
-Wno-unknown-warning-option \
|
||||
-Wno-cast-align \
|
||||
-Wno-assign-enum \
|
||||
-pedantic-errors
|
||||
-pedantic-errors \
|
||||
-fsanitize=address -fno-omit-frame-pointer
|
||||
else
|
||||
ifneq ($(CC), g++)
|
||||
CFLAGS += -Wmissing-prototypes -Wstrict-prototypes
|
||||
|
@ -41,7 +42,7 @@ endif
|
|||
# do this last otherwise there is whitespace in the command output and
|
||||
# it makes my OCD act up
|
||||
CFLAGS += $(OPTIONAL_CFLAGS)
|
||||
LDFLAGS += $(OPTIONAL_LDFLAGS)
|
||||
LDFLAGS += $(OPTIONAL_LDFLAGS) -fsanitize=address -fno-omit-frame-pointer
|
||||
|
||||
#we have duplicate object files when dealing with creating a simple list
|
||||
#for dependinces. To combat this we use some clever recrusive-make to
|
||||
|
|
5
hash.c
5
hash.c
|
@ -22,6 +22,7 @@
|
|||
*/
|
||||
#include "gmqcc.h"
|
||||
#include <limits.h>
|
||||
#include <string.h>
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# define HASH_ROTL32(X, Y) _rotl((X), (Y))
|
||||
|
@ -224,6 +225,7 @@ static GMQCC_FORCEINLINE uint32_t hash_murmur(const void *GMQCC_RESTRICT key, si
|
|||
}
|
||||
|
||||
size_t hash(const char *key) {
|
||||
#if 0
|
||||
const char *s = key;
|
||||
const char *a = s;
|
||||
const size_t *w;
|
||||
|
@ -236,6 +238,9 @@ size_t hash(const char *key) {
|
|||
for (s = (const char *)w; *s; s++);
|
||||
|
||||
return hash_murmur((const void *)key, s-a);
|
||||
#else
|
||||
return hash_murmur((const void *)key, strlen(key));
|
||||
#endif
|
||||
}
|
||||
|
||||
#undef HASH_ROTL32
|
||||
|
|
Loading…
Reference in a new issue