diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
| commit | 5f00496ef2e39b976b062f196ff01a99fd4864a4 (patch) | |
| tree | 20be9cbc8f4b7ed3e616ce23552728083801e846 /usr/src/head/netdir.h | |
| parent | af59b1a40df03681c1c8129aea7b1f5f52f2bcea (diff) | |
| parent | 86bb58aec7165f8a0303564575c65e5a2ad58bf1 (diff) | |
| download | illumos-joyent-release-20140821.tar.gz | |
[illumos-gate merge]20140821release-20140821
commit 86bb58aec7165f8a0303564575c65e5a2ad58bf1
5095 panic when adding a duplicate dbuf to dn_dbufs
commit 60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8
5092 env files don't need to define LOCKNAME by default
5091 illumos.sh env file's LOCKNAME definition is busted
commit 5e3f545c431ec4bce3e1b52f3f81bc9befe501f2
4989 removal of ntfsprogs and parted
commit ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
5066 remove support for non-ANSI compilation
5068 Remove SCCSID() macro from <macros.h>
commit d8ccf998f9c944b8cf27ed840c376f9b79ebce5c
5087 8-bit inline atomic {add,or,and} use wrong reg constraints on x86
Manifests:
usr/src/pkg/manifests/SUNWntfsprogs.mf (torch library)
usr/src/pkg/manifests/SUNWparted.mf (torch headers)
usr/src/pkg/manifests/system-file-system-ntfsprogs.mf
usr/src/pkg/manifests/system-storage-parted.mf
Diffstat (limited to 'usr/src/head/netdir.h')
| -rw-r--r-- | usr/src/head/netdir.h | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/usr/src/head/netdir.h b/usr/src/head/netdir.h index 694390ee1c..7d26eeb370 100644 --- a/usr/src/head/netdir.h +++ b/usr/src/head/netdir.h @@ -19,11 +19,13 @@ * * CDDL HEADER END */ +/* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> + */ /* Copyright (c) 1992 Sun Microsystems, Inc. */ /* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */ /* All Rights Reserved */ - /* * netdir.h * @@ -34,8 +36,6 @@ #ifndef _NETDIR_H #define _NETDIR_H -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.5 */ - /* * This files uses struct netconfig, and netconfig.h must be included * before this to avoid warnings. @@ -79,8 +79,6 @@ extern int _nderror; #endif /* _REENTRANT */ -#ifdef __STDC__ - int netdir_options(struct netconfig *, int option, int fd, char *par); int netdir_getbyname(struct netconfig *, struct nd_hostserv *, struct nd_addrlist **); @@ -101,25 +99,6 @@ struct netbuf *_uaddr2taddr(struct netconfig *, char *); char *_taddr2uaddr(struct netconfig *, struct netbuf *); char *_netdir_mergeaddr(struct netconfig *, char *uaddr, char *ruaddr); -#else /* __STDC__ */ - -int netdir_options(); -int netdir_getbyname(); -int netdir_getbyaddr(); -int netdir_mergeaddr(); -void netdir_free(); -struct netbuf *uaddr2taddr(); -void netdir_perror(); -char *netdir_sperror(); -char *taddr2uaddr(); -struct nd_addrlist *_netdir_getbyname(); -struct nd_hostservlist *_netdir_getbyaddr(); -char *_netdir_mergeaddr(); -struct netbuf *_uaddr2taddr(); -char *_taddr2uaddr(); - -#endif /* __STDC__ */ - /* * These are all objects that can be freed by netdir_free */ |