Module Name: src
Committed By: pgoyette
Date: Thu Jun 23 05:19:42 UTC 2016
Modified Files:
src/external/cddl/osnet/sys/kern: string.c
Log Message:
On NetBSD we already have strpbrk() in libkern, so we don't need to
provide another copy in the module. Removes another 'redefined symbol'
error when loading the module.
Related to PR kern/51265
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/cddl/osnet/sys/kern/string.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/kern/string.c
diff -u src/external/cddl/osnet/sys/kern/string.c:1.2 src/external/cddl/osnet/sys/kern/string.c:1.3
--- src/external/cddl/osnet/sys/kern/string.c:1.2 Tue Dec 14 01:01:40 2010
+++ src/external/cddl/osnet/sys/kern/string.c Thu Jun 23 05:19:42 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: string.c,v 1.2 2010/12/14 01:01:40 haad Exp $ */
+/* $NetBSD: string.c,v 1.3 2016/06/23 05:19:42 pgoyette Exp $ */
/*
* CDDL HEADER START
@@ -33,6 +33,7 @@
#define IS_ALPHA(c) \
(((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z'))
+#ifndef __NetBSD__
char *
strpbrk(const char *s, const char *b)
{
@@ -47,6 +48,7 @@ strpbrk(const char *s, const char *b)
return (NULL);
}
+#endif
/*
* Convert a string into a valid C identifier by replacing invalid
