diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:34:38 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2018-12-27 16:34:38 +0000 |
| commit | 7576c27563a3e43c0a276bf222244bcaf220a6fa (patch) | |
| tree | ad96fd1f1b9b57a50005db7803f6b79e748bb820 /inet/inet_net.c | |
| parent | ab5f5211585bf0f33bbfa2d4aaf17e4f0d1fa564 (diff) | |
| parent | 064374be911f72dfaec8a75f06da1f9fc1827712 (diff) | |
Merge branch 't/hurdsig-global-dispositions' into refs/top-bases/t/hurdsig-SA_SIGINFO
Diffstat (limited to 'inet/inet_net.c')
| -rw-r--r-- | inet/inet_net.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/inet/inet_net.c b/inet/inet_net.c index 2e8752d3be..eeb9830d5e 100644 --- a/inet/inet_net.c +++ b/inet/inet_net.c @@ -27,7 +27,7 @@ * SUCH DAMAGE. */ -/* Copyright (C) 2013-2016 Free Software Foundation, Inc. +/* Copyright (C) 2013-2018 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -44,11 +44,6 @@ License along with the GNU C Library; if not, see <http://www.gnu.org/licenses/>. */ - -#if defined(LIBC_SCCS) && !defined(lint) -static char sccsid[] = "@(#)inet_network.c 8.1 (Berkeley) 6/4/93"; -#endif /* LIBC_SCCS and not lint */ - #include <sys/types.h> #include <netinet/in.h> #include <arpa/inet.h> @@ -59,12 +54,12 @@ static char sccsid[] = "@(#)inet_network.c 8.1 (Berkeley) 6/4/93"; * The library routines call this routine to interpret * network numbers. */ -u_int32_t +uint32_t inet_network (const char *cp) { - u_int32_t val, base, n, i; + uint32_t val, base, n, i; char c; - u_int32_t parts[4], *pp = parts; + uint32_t parts[4], *pp = parts; int digit; again: |