aboutsummaryrefslogtreecommitdiffstats
path: root/lib/libspl
diff options
context:
space:
mode:
authorнаб <[email protected]>2022-01-22 01:56:46 +0100
committerBrian Behlendorf <[email protected]>2022-03-15 15:13:48 -0700
commitd465fc584425c618f8baa13a31b70ffabe053484 (patch)
treed5c120208b294829231adc7d7efbb28fdee3adcd /lib/libspl
parent861166b02701dfc8f63a105bd32758e806c84fd7 (diff)
Forbid b{copy,zero,cmp}(). Don't include <strings.h> for <string.h>
Reviewed-by: Brian Behlendorf <[email protected]> Signed-off-by: Ahelenia Ziemiańska <[email protected]> Closes #12996
Diffstat (limited to 'lib/libspl')
-rw-r--r--lib/libspl/include/sys/Makefile.am2
-rw-r--r--lib/libspl/include/sys/string.h1
-rw-r--r--lib/libspl/include/sys/strings.h33
3 files changed, 2 insertions, 34 deletions
diff --git a/lib/libspl/include/sys/Makefile.am b/lib/libspl/include/sys/Makefile.am
index 6816a0125..8305a5180 100644
--- a/lib/libspl/include/sys/Makefile.am
+++ b/lib/libspl/include/sys/Makefile.am
@@ -29,7 +29,7 @@ libspl_HEADERS = \
simd.h \
stack.h \
stdtypes.h \
- strings.h \
+ string.h \
stropts.h \
sunddi.h \
systeminfo.h \
diff --git a/lib/libspl/include/sys/string.h b/lib/libspl/include/sys/string.h
new file mode 100644
index 000000000..3b2f59002
--- /dev/null
+++ b/lib/libspl/include/sys/string.h
@@ -0,0 +1 @@
+#include <string.h>
diff --git a/lib/libspl/include/sys/strings.h b/lib/libspl/include/sys/strings.h
deleted file mode 100644
index c142047dc..000000000
--- a/lib/libspl/include/sys/strings.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
- * Use is subject to license terms.
- */
-
-#ifndef _LIBSPL_SYS_STRINGS_H
-#define _LIBSPL_SYS_STRINGS_H
-
-#include <string.h>
-#include <strings.h>
-
-#endif