diff options
| author | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
|---|---|---|
| committer | John Levon <john.levon@joyent.com> | 2020-05-26 13:57:13 +0000 |
| commit | 5b2acc0949194447bba6e45a0fa44d0b5f42f208 (patch) | |
| tree | 7ea9eb87bc68fee386dd39035ce715e87a0e673c /usr/src/head | |
| parent | 8ca018083101bf1cb175869679bc123187fb1bab (diff) | |
| parent | 2a1277d3064386cd5c4e372301007aa330bf1d5e (diff) | |
| download | illumos-joyent-gcc9.tar.gz | |
mergegcc9
Diffstat (limited to 'usr/src/head')
| -rw-r--r-- | usr/src/head/Makefile | 3 | ||||
| -rw-r--r-- | usr/src/head/bhyve.h | 25 | ||||
| -rw-r--r-- | usr/src/head/string.h | 1 |
3 files changed, 2 insertions, 27 deletions
diff --git a/usr/src/head/Makefile b/usr/src/head/Makefile index 562664bde5..75e2788897 100644 --- a/usr/src/head/Makefile +++ b/usr/src/head/Makefile @@ -33,8 +33,7 @@ include ../Makefile.master sparc_HDRS= i386_HDRS= \ - stack_unwind.h \ - bhyve.h + stack_unwind.h KRB5HDRS= \ mit_copyright.h \ diff --git a/usr/src/head/bhyve.h b/usr/src/head/bhyve.h deleted file mode 100644 index 8c79ca1ccc..0000000000 --- a/usr/src/head/bhyve.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - * COPYRIGHT 2013 Pluribus Networks Inc. - * - * All rights reserved. This copyright notice is Copyright Management - * Information under 17 USC 1202 and is included to protect this work and - * deter copyright infringement. Removal or alteration of this Copyright - * Management Information without the express written permission from - * Pluribus Networks Inc is prohibited, and any such unauthorized removal - * or alteration will be a violation of federal law. - */ -#ifndef _BHYVE_H -#define _BHYVE_H - -#ifdef __cplusplus -extern "C" { -#endif - -#define BHYVE_TMPDIR "/var/run/bhyve" -#define BHYVE_CONS_SOCKPATH BHYVE_TMPDIR "/%s.console_sock" - -#ifdef __cplusplus -} -#endif - -#endif /* _BHYVE_H */ diff --git a/usr/src/head/string.h b/usr/src/head/string.h index 1314fbbbb8..f75c14c59c 100644 --- a/usr/src/head/string.h +++ b/usr/src/head/string.h @@ -22,6 +22,7 @@ /* * Copyright 2014 Garrett D'Amore <garrett@damore.org> * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright 2020 Joyent, Inc. */ /* Copyright (c) 1988 AT&T */ |