[illumos-gate merge]

commit a6d101109bfb442cf0db6d8ebb5fb7c32cb16d7e
    9472 Add smbutil discon command
commit 4226f635096bf9d814aa9fb335518c4855bbe3a3
    6375 Add native name demangling support
commit 83b4671e6262c5aa6b4f9fb5a384b1946dfc2e7f
    9664 loader: need UEFI32 support
commit e1bf37b1abeb6653a6e35e2bd6924131cced1efe
    9884 cw(1) should use -fpic rather than -Kpic

	Conflicts:
	usr/src/test/util-tests/tests/Makefile
	usr/src/cmd/mdb/common/mdb/mdb_demangle.c

1 files changed, 39 insertions, 0 deletions

diff --git a/usr/src/lib/libdemangle/common/demangle_int.h b/usr/src/lib/libdemangle/common/demangle_int.h
new file mode 100644
index 0000000000..9abb2cc295
--- /dev/null
+++ b/usr/src/lib/libdemangle/common/demangle_int.h
@@ -0,0 +1,39 @@
+/*
+ * This file and its contents are supplied under the terms of the
+ * Common Development and Distribution License ("CDDL"), version 1.0.
+ * You may only use this file in accordance with the terms of version
+ * 1.0 of the CDDL.
+ *
+ * A full copy of the text of the CDDL should have accompanied this
+ * source.  A copy of the CDDL is also available via the Internet at
+ * http://www.illumos.org/license/CDDL.
+ */
+
+/*
+ * Copyright 2017 Jason King
+ */
+#ifndef _DEMANGLE_INT_H
+#define	_DEMANGLE_INT_H
+
+#include <stdio.h>
+#include "demangle-sys.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern sysdem_ops_t *sysdem_ops_default;
+
+char *cpp_demangle(const char *, sysdem_ops_t *);
+
+void *zalloc(sysdem_ops_t *, size_t);
+void *xrealloc(sysdem_ops_t *, void *, size_t, size_t);
+void xfree(sysdem_ops_t *, void *, size_t);
+
+extern volatile boolean_t demangle_debug;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _DEMANGLE_INT_H */