Module Name: src Committed By: rmind Date: Sun Jun 30 12:20:32 UTC 2013
Modified Files: src/common/lib/libc/hash/murmurhash: murmurhash.c Log Message: RUMP fix: ifdef weak alias. Pointed out by martin@. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/common/lib/libc/hash/murmurhash/murmurhash.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/common/lib/libc/hash/murmurhash/murmurhash.c diff -u src/common/lib/libc/hash/murmurhash/murmurhash.c:1.4 src/common/lib/libc/hash/murmurhash/murmurhash.c:1.5 --- src/common/lib/libc/hash/murmurhash/murmurhash.c:1.4 Tue Jul 10 17:05:38 2012 +++ src/common/lib/libc/hash/murmurhash/murmurhash.c Sun Jun 30 12:20:32 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: murmurhash.c,v 1.4 2012/07/10 17:05:38 christos Exp $ */ +/* $NetBSD: murmurhash.c,v 1.5 2013/06/30 12:20:32 rmind Exp $ */ /* * MurmurHash2 -- from the original code: @@ -14,12 +14,12 @@ #include <sys/cdefs.h> #if defined(_KERNEL) || defined(_STANDALONE) -__KERNEL_RCSID(0, "$NetBSD: murmurhash.c,v 1.4 2012/07/10 17:05:38 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: murmurhash.c,v 1.5 2013/06/30 12:20:32 rmind Exp $"); #else #if defined(LIBC_SCCS) && !defined(lint) -__RCSID("$NetBSD: murmurhash.c,v 1.4 2012/07/10 17:05:38 christos Exp $"); +__RCSID("$NetBSD: murmurhash.c,v 1.5 2013/06/30 12:20:32 rmind Exp $"); #endif /* LIBC_SCCS and not lint */ #include "namespace.h" @@ -28,9 +28,11 @@ __RCSID("$NetBSD: murmurhash.c,v 1.4 201 #include <sys/types.h> #include <sys/hash.h> +#if !defined(_KERNEL) && !defined(_STANDALONE) #ifdef __weak_alias __weak_alias(murmurhash2,_murmurhash2) #endif +#endif uint32_t murmurhash2(const void *key, size_t len, uint32_t seed)