BSD 4_3_Net_2 release

[unix-history] / usr / src / include / arpa / inet.h

diff --git a/usr/src/include/arpa/inet.h b/usr/src/include/arpa/inet.h
index 287971d..cfe2a2f 100644 (file)
--- a/usr/src/include/arpa/inet.h
+++ b/usr/src/include/arpa/inet.h
@@ -2,37 +2,51 @@
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1983 Regents of the University of California.
  * All rights reserved.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that: (1) source distributions retain this entire copyright
- * notice and comment, and (2) distributions including binaries display
- * the following acknowledgement:  ``This product includes software
- * developed by the University of California, Berkeley and its contributors''
- * in the documentation or other materials provided with the distribution
- * and in all advertising materials mentioning features or use of this
- * software. Neither the name of the University nor the names of its
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * 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.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)inet.h      5.4 (Berkeley) 6/1/90
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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.
+ *
+ *     @(#)inet.h      5.7 (Berkeley) 4/3/91

  */
 
  */
 

+#ifndef _INET_H_
+#define        _INET_H_
+

 /* External definitions for functions in inet(3) */
 
 /* External definitions for functions in inet(3) */
 

-#ifdef __STDC__
-extern unsigned long inet_addr(const char *);
-extern char *inet_ntoa(struct in_addr);
-extern struct in_addr inet_makeaddr(int , int);
-extern unsigned long inet_network(const char *);
-extern unsigned long inet_lnaof(struct in_addr);
-extern unsigned long inet_netof(struct in_addr);
-#else
-extern unsigned long inet_addr();
-extern char *inet_ntoa();
-extern struct in_addr inet_makeaddr();
-extern unsigned long inet_network();
-extern unsigned long inet_lnaof();
-extern unsigned long inet_netof();
-#endif
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+extern unsigned long    inet_addr __P((const char *));
+extern unsigned long    inet_lnaof __P((struct in_addr));
+extern struct in_addr   inet_makeaddr __P((u_long , u_long));
+extern unsigned long    inet_netof __P((struct in_addr));
+extern unsigned long    inet_network __P((const char *));
+extern char            *inet_ntoa __P((struct in_addr));
+__END_DECLS
+
+#endif /* !_INET_H_ */