Module Name:    src
Committed By:   hannken
Date:           Thu Jun  6 14:58:51 UTC 2019

Added Files:
        src/external/cddl/osnet/sys: libshare.h
        src/external/cddl/osnet/sys/sys: systeminfo.h
Removed Files:
        src/external/cddl/osnet/dist/lib/libshare/common: libshare.h
        src/external/cddl/osnet/dist/uts/common/sys: systeminfo.h taskq_impl.h

Log Message:
Handle files not present upstream:

dist/lib/libshare/common/libshare.h -> sys/libshare.h
dist/uts/common/sys/systeminfo.h    -> sys/sys/systeminfo.h
dist/uts/common/sys/taskq_impl.h    -> TRASH

No functional change intended.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 \
    src/external/cddl/osnet/dist/lib/libshare/common/libshare.h
cvs rdiff -u -r1.1.1.3 -r0 \
    src/external/cddl/osnet/dist/uts/common/sys/systeminfo.h \
    src/external/cddl/osnet/dist/uts/common/sys/taskq_impl.h
cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/sys/libshare.h
cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/sys/sys/systeminfo.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: src/external/cddl/osnet/sys/libshare.h
diff -u /dev/null src/external/cddl/osnet/sys/libshare.h:1.1
--- /dev/null	Thu Jun  6 14:58:51 2019
+++ src/external/cddl/osnet/sys/libshare.h	Thu Jun  6 14:58:50 2019
@@ -0,0 +1,36 @@
+/*-
+ * Copyright (c) 2007 Pawel Jakub Dawidek <p...@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHORS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _OPENSOLARIS_LIBSHARE_H_
+#define _OPENSOLARIS_LIBSHARE_H_
+
+#define	SA_OK	0
+
+#define	SA_INIT_CONTROL_API	0
+
+#endif	/* !_OPENSOLARIS_LIBSHARE_H_ */

Index: src/external/cddl/osnet/sys/sys/systeminfo.h
diff -u /dev/null src/external/cddl/osnet/sys/sys/systeminfo.h:1.1
--- /dev/null	Thu Jun  6 14:58:51 2019
+++ src/external/cddl/osnet/sys/sys/systeminfo.h	Thu Jun  6 14:58:51 2019
@@ -0,0 +1,6 @@
+#ifndef _SYS_SYSTEMINFO_H_
+#define	_SYS_SYSTEMINFO_H_
+
+#define	HW_HOSTID_LEN	11
+
+#endif	/* !_SYS_SYSTEMINFO_H_ */

Reply via email to