diff options
Diffstat (limited to 'src/lib/libc/net/inet_makeaddr.c')
-rw-r--r-- | src/lib/libc/net/inet_makeaddr.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/lib/libc/net/inet_makeaddr.c b/src/lib/libc/net/inet_makeaddr.c index 84d366e03a..196a589e4c 100644 --- a/src/lib/libc/net/inet_makeaddr.c +++ b/src/lib/libc/net/inet_makeaddr.c | |||
@@ -1,5 +1,3 @@ | |||
1 | /* $NetBSD: inet_makeaddr.c,v 1.4 1995/02/25 06:20:42 cgd Exp $ */ | ||
2 | |||
3 | /* | 1 | /* |
4 | * Copyright (c) 1983, 1993 | 2 | * Copyright (c) 1983, 1993 |
5 | * The Regents of the University of California. All rights reserved. | 3 | * The Regents of the University of California. All rights reserved. |
@@ -34,11 +32,7 @@ | |||
34 | */ | 32 | */ |
35 | 33 | ||
36 | #if defined(LIBC_SCCS) && !defined(lint) | 34 | #if defined(LIBC_SCCS) && !defined(lint) |
37 | #if 0 | 35 | static char rcsid[] = "$OpenBSD: inet_makeaddr.c,v 1.3 1997/04/05 21:13:12 millert Exp $"; |
38 | static char sccsid[] = "@(#)inet_makeaddr.c 8.1 (Berkeley) 6/4/93"; | ||
39 | #else | ||
40 | static char rcsid[] = "$NetBSD: inet_makeaddr.c,v 1.4 1995/02/25 06:20:42 cgd Exp $"; | ||
41 | #endif | ||
42 | #endif /* LIBC_SCCS and not lint */ | 36 | #endif /* LIBC_SCCS and not lint */ |
43 | 37 | ||
44 | #include <sys/param.h> | 38 | #include <sys/param.h> |
@@ -51,9 +45,9 @@ static char rcsid[] = "$NetBSD: inet_makeaddr.c,v 1.4 1995/02/25 06:20:42 cgd Ex | |||
51 | */ | 45 | */ |
52 | struct in_addr | 46 | struct in_addr |
53 | inet_makeaddr(net, host) | 47 | inet_makeaddr(net, host) |
54 | u_long net, host; | 48 | in_addr_t net, host; |
55 | { | 49 | { |
56 | u_long addr; | 50 | in_addr_t addr; |
57 | 51 | ||
58 | if (net < 128) | 52 | if (net < 128) |
59 | addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST); | 53 | addr = (net << IN_CLASSA_NSHIFT) | (host & IN_CLASSA_HOST); |