[src/trunk]: src/external/cddl/osnet/sys/kern On NetBSD we already have strpb...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/72dd7e18dd14
branches:  trunk
changeset: 816220:72dd7e18dd14
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Thu Jun 23 05:19:42 2016 +0000

description:
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

diffstat:

 external/cddl/osnet/sys/kern/string.c |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (25 lines):

diff -r a5967896ad32 -r 72dd7e18dd14 external/cddl/osnet/sys/kern/string.c
--- a/external/cddl/osnet/sys/kern/string.c     Thu Jun 23 04:41:03 2016 +0000
+++ b/external/cddl/osnet/sys/kern/string.c     Thu Jun 23 05:19:42 2016 +0000
@@ -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 @@
 
        return (NULL);
 }
+#endif
 
 /*
  * Convert a string into a valid C identifier by replacing invalid