Module Name: src
Committed By: rmind
Date: Mon Jul 9 21:25:46 UTC 2012
Modified Files:
src/common/lib/libc/hash/murmurhash: murmurhash.c
src/lib/libc/include: namespace.h
Log Message:
Add weak symbol for murmurhash2.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/hash/murmurhash/murmurhash.c
cvs rdiff -u -r1.154 -r1.155 src/lib/libc/include/namespace.h
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.2 src/common/lib/libc/hash/murmurhash/murmurhash.c:1.3
--- src/common/lib/libc/hash/murmurhash/murmurhash.c:1.2 Sun Jul 8 13:42:29 2012
+++ src/common/lib/libc/hash/murmurhash/murmurhash.c Mon Jul 9 21:25:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: murmurhash.c,v 1.2 2012/07/08 13:42:29 rmind Exp $ */
+/* $NetBSD: murmurhash.c,v 1.3 2012/07/09 21:25:46 rmind Exp $ */
/*
* MurmurHash2 -- from the original code:
@@ -12,13 +12,19 @@
*/
#include <sys/cdefs.h>
-#include <sys/types.h>
-#include <sys/hash.h>
#if defined(_KERNEL) || defined(_STANDALONE)
-__KERNEL_RCSID(0, "$NetBSD: murmurhash.c,v 1.2 2012/07/08 13:42:29 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: murmurhash.c,v 1.3 2012/07/09 21:25:46 rmind Exp $");
#else
-__RCSID("$NetBSD: murmurhash.c,v 1.2 2012/07/08 13:42:29 rmind Exp $");
+__RCSID("$NetBSD: murmurhash.c,v 1.3 2012/07/09 21:25:46 rmind Exp $");
+#endif
+
+#include "namespace.h"
+#include <sys/types.h>
+#include <sys/hash.h>
+
+#ifdef __weak_alias
+__weak_alias(murmurhash2,_murmurhash2)
#endif
uint32_t
Index: src/lib/libc/include/namespace.h
diff -u src/lib/libc/include/namespace.h:1.154 src/lib/libc/include/namespace.h:1.155
--- src/lib/libc/include/namespace.h:1.154 Sun Jun 3 21:42:46 2012
+++ src/lib/libc/include/namespace.h Mon Jul 9 21:25:46 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.154 2012/06/03 21:42:46 joerg Exp $ */
+/* $NetBSD: namespace.h,v 1.155 2012/07/09 21:25:46 rmind Exp $ */
/*-
* Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -458,6 +458,7 @@
#define mq_timedreceive _mq_timedreceive
#define mq_timedsend _mq_timedsend
#define mrand48 _mrand48
+#define murmurhash2 _murmurhash2
#define nc_perror _nc_perror
#define nc_sperror _nc_sperror
#define nanosleep _nanosleep
