readv and writev are in <sys/uio.h>; delete them, but leave the

[unix-history] / usr / src / include / netdb.h

diff --git a/usr/src/include/netdb.h b/usr/src/include/netdb.h
index 4637338..4293b78 100644 (file)
--- a/usr/src/include/netdb.h
+++ b/usr/src/include/netdb.h
@@ -1,12 +1,36 @@
 /*-
 /*-

- * Copyright (c) 1980, 1983, 1988 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1983, 1988, 1993
+ *     The Regents of the University of California.  All rights reserved.

  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)netdb.h     5.11 (Berkeley) %G%
+ *      @(#)netdb.h    8.1 (Berkeley) %G%
+ *     $Id: netdb.h,v 4.9.1.2 1993/05/17 09:59:01 vixie Exp $
+ * -
+ * Portions Copyright (c) 1993 by Digital Equipment Corporation.
+ * 
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies, and that
+ * the name of Digital Equipment Corporation not be used in advertising or
+ * publicity pertaining to distribution of the document or software without
+ * specific, written prior permission.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
+ * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS.   IN NO EVENT SHALL DIGITAL EQUIPMENT
+ * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
+ * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
+ * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
+ * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
+ * SOFTWARE.
+ * -
+ * --Copyright--

  */
 
  */
 

+#ifndef _NETDB_H_
+#define _NETDB_H_
+

 #define        _PATH_HEQUIV    "/etc/hosts.equiv"
 #define        _PATH_HOSTS     "/etc/hosts"
 #define        _PATH_NETWORKS  "/etc/networks"
 #define        _PATH_HEQUIV    "/etc/hosts.equiv"
 #define        _PATH_HOSTS     "/etc/hosts"
 #define        _PATH_NETWORKS  "/etc/networks"


@@ -28,7 +52,7 @@ struct        hostent {
 
 /*
  * Assumption here is that a network number
 
 /*
  * Assumption here is that a network number

- * fits in 32 bits -- probably a poor one.
+ * fits in an unsigned long -- probably a poor one.

  */
 struct netent {
        char            *n_name;        /* official name of net */
  */
 struct netent {
        char            *n_name;        /* official name of net */


@@ -50,11 +74,6 @@ struct       protoent {
        int     p_proto;        /* protocol # */
 };
 
        int     p_proto;        /* protocol # */
 };
 

-struct hostent *gethostbyname(), *gethostbyaddr(), *gethostent();
-struct netent  *getnetbyname(), *getnetbyaddr(), *getnetent();
-struct servent *getservbyname(), *getservbyport(), *getservent();
-struct protoent        *getprotobyname(), *getprotobynumber(), *getprotoent();
-

 /*
  * Error return codes from gethostbyname() and gethostbyaddr()
  * (left in extern int h_errno).
 /*
  * Error return codes from gethostbyname() and gethostbyaddr()
  * (left in extern int h_errno).


@@ -65,3 +84,33 @@ struct protoent      *getprotobyname(), *getprotobynumber(), *getprotoent();
 #define        NO_RECOVERY     3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
 #define        NO_DATA         4 /* Valid name, no data record of requested type */
 #define        NO_ADDRESS      NO_DATA         /* no address, look for MX record */
 #define        NO_RECOVERY     3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
 #define        NO_DATA         4 /* Valid name, no data record of requested type */
 #define        NO_ADDRESS      NO_DATA         /* no address, look for MX record */

+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+void           endhostent __P((void));
+void           endnetent __P((void));
+void           endprotoent __P((void));
+void           endservent __P((void));
+struct hostent *gethostbyaddr __P((const char *, int, int));
+struct hostent *gethostbyname __P((const char *));
+struct hostent *gethostent __P((void));
+struct netent  *getnetbyaddr __P((long, int)); /* u_long? */
+struct netent  *getnetbyname __P((const char *));
+struct netent  *getnetent __P((void));
+struct protoent        *getprotobyname __P((const char *));
+struct protoent        *getprotobynumber __P((int));
+struct protoent        *getprotoent __P((void));
+struct servent *getservbyname __P((const char *, const char *));
+struct servent *getservbyport __P((int, const char *));
+struct servent *getservent __P((void));
+void           herror __P((const char *));
+char           *hstrerror __P((int));
+void           sethostent __P((int));
+/* void                sethostfile __P((const char *)); */
+void           setnetent __P((int));
+void           setprotoent __P((int));
+void           setservent __P((int));
+__END_DECLS
+
+#endif /* !_NETDB_H_ */