projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
c++: fix -Wenum-in-bool-context
[awesomized/libmemcached]
/
libhashkit
/
fnv_64.cc
diff --git
a/libhashkit/fnv_64.cc
b/libhashkit/fnv_64.cc
index 0cfce633047991a83047b529eece2a86281f06af..68e4dd07ef564084cf87b47a1994b7da41d428e2 100644
(file)
--- a/
libhashkit/fnv_64.cc
+++ b/
libhashkit/fnv_64.cc
@@
-2,7
+2,7
@@
*
* HashKit library
*
*
* HashKit library
*
- * Copyright (C) 2011 Data Differential, http://datadifferential.com/
+ * Copyright (C) 2011
-2012
Data Differential, http://datadifferential.com/
* Copyright (C) 2009 Brian Aker All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* Copyright (C) 2009 Brian Aker All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-38,6
+38,8
@@
#include <libhashkit/common.h>
#include <libhashkit/common.h>
+#if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH)
+
/* FNV hash'es lifted from Dustin Sallings work */
static uint64_t FNV_64_INIT= 0xcbf29ce484222325;
static uint64_t FNV_64_PRIME= 0x100000001b3;
/* FNV hash'es lifted from Dustin Sallings work */
static uint64_t FNV_64_INIT= 0xcbf29ce484222325;
static uint64_t FNV_64_PRIME= 0x100000001b3;
@@
-69,3
+71,15
@@
uint32_t hashkit_fnv1a_64(const char *key, size_t key_length, void *)
return hash;
}
return hash;
}
+
+#else
+uint32_t hashkit_fnv1_64(const char *, size_t, void *)
+{
+ return 0;
+}
+
+uint32_t hashkit_fnv1a_64(const char *, size_t, void *)
+{
+ return 0;
+}
+#endif