summary refs log tree commit diff
path: root/inet
diff options
context:
space:
mode:
Diffstat (limited to 'inet')
-rw-r--r--inet/aliases.h2
-rw-r--r--inet/arpa/ftp.h6
-rw-r--r--inet/arpa/inet.h2
-rw-r--r--inet/arpa/telnet.h6
-rw-r--r--inet/arpa/tftp.h6
-rw-r--r--inet/getnameinfo.c2
-rw-r--r--inet/getnetgrent_r.c2
-rw-r--r--inet/inet_ntoa.c2
-rw-r--r--inet/netinet/ether.h4
-rw-r--r--inet/netinet/icmp6.h2
-rw-r--r--inet/netinet/in.h6
-rw-r--r--inet/netinet/ip6.h2
-rw-r--r--inet/protocols/routed.h6
-rw-r--r--inet/protocols/rwhod.h6
-rw-r--r--inet/protocols/talkd.h6
-rw-r--r--inet/protocols/timed.h6
16 files changed, 33 insertions, 33 deletions
diff --git a/inet/aliases.h b/inet/aliases.h
index 4c89a04113..c6e829007e 100644
--- a/inet/aliases.h
+++ b/inet/aliases.h
@@ -17,8 +17,8 @@
    Boston, MA 02111-1307, USA.  */
 
 #ifndef _ALIASES_H
-
 #define _ALIASES_H	1
+
 #include <features.h>
 
 #include <sys/types.h>
diff --git a/inet/arpa/ftp.h b/inet/arpa/ftp.h
index 64532b9e25..ac864aa708 100644
--- a/inet/arpa/ftp.h
+++ b/inet/arpa/ftp.h
@@ -33,8 +33,8 @@
  *	@(#)ftp.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef _FTP_H_
-#define	_FTP_H_
+#ifndef _ARPA_FTP_H
+#define	_ARPA_FTP_H 1
 
 /* Definitions for FTP; see RFC-765. */
 
@@ -106,4 +106,4 @@ char *modenames[] =  {"0", "Stream", "Block", "Compressed" };
 
 #define	BLK_BYTECOUNT	2	/* Bytes in this block */
 
-#endif /* !_FTP_H_ */
+#endif /* arpa/ftp.h */
diff --git a/inet/arpa/inet.h b/inet/arpa/inet.h
index 0593c8fad6..ab4f0c9ea6 100644
--- a/inet/arpa/inet.h
+++ b/inet/arpa/inet.h
@@ -17,8 +17,8 @@
    Boston, MA 02111-1307, USA.  */
 
 #ifndef _ARPA_INET_H
-
 #define	_ARPA_INET_H	1
+
 #include <features.h>
 
 #include <sys/types.h>
diff --git a/inet/arpa/telnet.h b/inet/arpa/telnet.h
index 17255a1c7b..3309e5d727 100644
--- a/inet/arpa/telnet.h
+++ b/inet/arpa/telnet.h
@@ -33,8 +33,8 @@
  *	@(#)telnet.h	8.2 (Berkeley) 12/15/93
  */
 
-#ifndef _TELNET_H_
-#define	_TELNET_H_
+#ifndef _ARPA_TELNET_H
+#define	_ARPA_TELNET_H 1
 
 /*
  * Definitions for the TELNET protocol.
@@ -317,4 +317,4 @@ extern char *enctype_names[];
 #define	ENCTYPE_NAME_OK(x)	((unsigned int)(x) < ENCTYPE_CNT)
 #define	ENCTYPE_NAME(x)		enctype_names[x]
 
-#endif /* !_TELNET_H_ */
+#endif /* arpa/telnet.h */
diff --git a/inet/arpa/tftp.h b/inet/arpa/tftp.h
index e2651a5019..0904407c73 100644
--- a/inet/arpa/tftp.h
+++ b/inet/arpa/tftp.h
@@ -33,8 +33,8 @@
  *	@(#)tftp.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef _TFTP_H_
-#define	_TFTP_H_
+#ifndef _ARPA_TFTP_H
+#define	_ARPA_TFTP_H 1
 
 /*
  * Trivial File Transfer Protocol (IEN-133)
@@ -77,4 +77,4 @@ struct	tftphdr {
 #define	EEXISTS		6		/* file already exists */
 #define	ENOUSER		7		/* no such user */
 
-#endif /* !_TFTP_H_ */
+#endif /* arpa/tftp.h */
diff --git a/inet/getnameinfo.c b/inet/getnameinfo.c
index 95ed6bf3f9..7c28e551b3 100644
--- a/inet/getnameinfo.c
+++ b/inet/getnameinfo.c
@@ -61,7 +61,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <stdio.h>
 #include <unistd.h>
 #include <alloca.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
 #include <arpa/inet.h>
 
 #ifndef AF_LOCAL
diff --git a/inet/getnetgrent_r.c b/inet/getnetgrent_r.c
index 1ef043a326..5afe82561c 100644
--- a/inet/getnetgrent_r.c
+++ b/inet/getnetgrent_r.c
@@ -16,7 +16,7 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
 #include <netdb.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/inet/inet_ntoa.c b/inet/inet_ntoa.c
index b6087a982f..3e9636c5df 100644
--- a/inet/inet_ntoa.c
+++ b/inet/inet_ntoa.c
@@ -21,7 +21,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <arpa/inet.h>
-#include <libc-lock.h>
+#include <bits/libc-lock.h>
 
 /* The interface of this function is completely stupid, it requires a
    static buffer.  We relax this a bit in that we allow at least one
diff --git a/inet/netinet/ether.h b/inet/netinet/ether.h
index 06d01b1508..c7985d7acc 100644
--- a/inet/netinet/ether.h
+++ b/inet/netinet/ether.h
@@ -17,9 +17,9 @@
    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#ifndef __NETINET_ETHER_H
+#ifndef _NETINET_ETHER_H
+#define _NETINET_ETHER_H	1
 
-#define __NETINET_ETHER_H	1
 #include <features.h>
 
 /* Get definition of `struct ether_addr'.  */
diff --git a/inet/netinet/icmp6.h b/inet/netinet/icmp6.h
index 90c61afda8..7d8d86665e 100644
--- a/inet/netinet/icmp6.h
+++ b/inet/netinet/icmp6.h
@@ -185,4 +185,4 @@ struct nd6_opt_mtu 		/* MTU option */
     u_int32_t		opt_mtu;
   };
 
-#endif /* _NETINET6_ICMPV6_H */
+#endif /* netinet/icmpv6.h */
diff --git a/inet/netinet/in.h b/inet/netinet/in.h
index a85dccd6de..7a9d42d5fa 100644
--- a/inet/netinet/in.h
+++ b/inet/netinet/in.h
@@ -17,8 +17,8 @@
    Boston, MA 02111-1307, USA.  */
 
 #ifndef	_NETINET_IN_H
-
 #define	_NETINET_IN_H	1
+
 #include <features.h>
 
 #include <sys/socket.h>
@@ -90,7 +90,7 @@ enum
 /* Internet address.  */
 struct in_addr
   {
-    unsigned int s_addr;
+    u_int32_t s_addr;
   };
 
 
@@ -164,7 +164,7 @@ extern const struct in6_addr in6addr_loopback;   /* ::1 */
 #define INET6_ADDRSTRLEN 46
 
 /* Get the definition of the macro to define the common sockaddr members.  */
-#include <sockaddrcom.h>
+#include <bits/sockaddr.h>
 
 
 /* Structure describing an Internet socket address.  */
diff --git a/inet/netinet/ip6.h b/inet/netinet/ip6.h
index 65bf7211e8..e4e0e672ff 100644
--- a/inet/netinet/ip6.h
+++ b/inet/netinet/ip6.h
@@ -42,4 +42,4 @@ struct ipv6hdr
   struct in6_addr ipv6_dst;
 };
 
-#endif /* _NETINET_IP6_H */
+#endif /* netinet/ip6.h */
diff --git a/inet/protocols/routed.h b/inet/protocols/routed.h
index f41fc2182a..f342239db9 100644
--- a/inet/protocols/routed.h
+++ b/inet/protocols/routed.h
@@ -33,8 +33,8 @@
  *	@(#)routed.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef _ROUTED_H_
-#define	_ROUTED_H_
+#ifndef _PROTOCOLS_ROUTED_H
+#define	_PROTOCOLS_ROUTED_H 1
 
 /*
  * Routing Information Protocol
@@ -101,4 +101,4 @@ char *ripcmds[RIPCMD_MAX] =
 #define	EXPIRE_TIME		180	/* time to mark entry invalid */
 #define	GARBAGE_TIME		240	/* time to garbage collect */
 
-#endif /* !_ROUTED_H_ */
+#endif /* protocols/routed.h */
diff --git a/inet/protocols/rwhod.h b/inet/protocols/rwhod.h
index 4ce44906a0..e5d9f991a8 100644
--- a/inet/protocols/rwhod.h
+++ b/inet/protocols/rwhod.h
@@ -33,8 +33,8 @@
  *	@(#)rwhod.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef _RWHOD_H_
-#define	_RWHOD_H_
+#ifndef _PROTOCOLS_RWHOD_H
+#define	_PROTOCOLS_RWHOD_H 1
 
 #include <sys/types.h>
 
@@ -67,4 +67,4 @@ struct	whod {
 
 #define	_PATH_RWHODIR	"/var/rwho"
 
-#endif /* !_RWHOD_H_ */
+#endif /* protocols/rwhod.h */
diff --git a/inet/protocols/talkd.h b/inet/protocols/talkd.h
index 6d893adfb5..5bec984d1f 100644
--- a/inet/protocols/talkd.h
+++ b/inet/protocols/talkd.h
@@ -33,8 +33,8 @@
  *	@(#)talkd.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef _TALKD_H_
-#define	_TALKD_H_
+#ifndef _PROTOCOLS_TALKD_H
+#define	_PROTOCOLS_TALKD_H 1
 
 /*
  * This describes the protocol used by the talk server and clients.
@@ -113,4 +113,4 @@ typedef struct {
 /* RING_WAIT should be 10's of seconds less than MAX_LIFE */
 #define RING_WAIT	30	/* time to wait before resending invitation */
 
-#endif /* !_TALKD_H_ */
+#endif /* protocols/talkd.h */
diff --git a/inet/protocols/timed.h b/inet/protocols/timed.h
index 1b569f5312..a2c9fb8ce4 100644
--- a/inet/protocols/timed.h
+++ b/inet/protocols/timed.h
@@ -33,8 +33,8 @@
  *	@(#)timed.h	8.1 (Berkeley) 6/2/93
  */
 
-#ifndef	_TIMED_H_
-#define	_TIMED_H_
+#ifndef	_PROTOCOLS_TIMED_H
+#define	_PROTOCOLS_TIMED_H 1
 
 /*
  * Time Synchronization Protocol
@@ -96,4 +96,4 @@ char *tsptype[TSPTYPENUMBER] =
   "TEST", "SETDATE", "SETDATEREQ", "LOOP" };
 #endif
 
-#endif /* !_TIMED_H_ */
+#endif /* protocols/timed.h */
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-06 09:35:00 +0000