From 9b48fa9b416094acd0f25a605c768f6cf3798f71 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 1 Apr 2000 22:30:22 +0000 Subject: Update. * include/netdb.h: Change type of first parameter of __getnetbyaddr_r. * inet/getnetbyad.c: Likewise. * inet/getnetbyad_r.c: Likewise. * nis/nss_nis/nis-network.c: Likewise. * nis/nssplus_nis/nisplus-network.c: Likewise. * nss/nss_files/files-network.c: Likewise. * resolv/netdb.h: Define uint32_t if not already happened. Include bits/netdb.h. Remove definition of struct netent. Change type of first parameter of getnetbyaddr_r and getnetbyaddr. * sysdeps/generic/stdint.h: Allow definition of uint32_t elsewhere. * sysdeps/generic/bits/netdb.h: New file. * sysdeps/unix/sysv/linux/alpha/bits/netdb.h: New file. --- sysdeps/generic/bits/netdb.h | 33 +++++++++++++++++++++++++++++++++ sysdeps/generic/stdint.h | 5 ++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 sysdeps/generic/bits/netdb.h (limited to 'sysdeps/generic') diff --git a/sysdeps/generic/bits/netdb.h b/sysdeps/generic/bits/netdb.h new file mode 100644 index 0000000000..f687a3ee7c --- /dev/null +++ b/sysdeps/generic/bits/netdb.h @@ -0,0 +1,33 @@ +/* Copyright (C) 1996, 1997, 1998, 1999, 2000 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 modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be + useful, but WITHOUT ANY WARRANTY; without even the implied warranty + of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If + not, write to the Free Software Foundation, Inc., 59 Temple Place - + Suite 330, Boston, MA 02111-1307, USA. */ + +#ifndef _NETDB_H +# error "Never include directly; use instead." +#endif + + +/* Description of data base entry for a single network. NOTE: here a + poor assumption is made. The network number is expected to fit + into an unsigned long int variable. */ +struct netent +{ + char *n_name; /* Official name of network. */ + char **n_aliases; /* Alias list. */ + int n_addrtype; /* Net address type. */ + uint32_t n_net; /* Network number. */ +}; diff --git a/sysdeps/generic/stdint.h b/sysdeps/generic/stdint.h index 1269b78f34..73f3108a42 100644 --- a/sysdeps/generic/stdint.h +++ b/sysdeps/generic/stdint.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 1999, 2000 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 @@ -49,7 +49,10 @@ typedef long long int int64_t; /* Unsigned. */ typedef unsigned char uint8_t; typedef unsigned short int uint16_t; +#ifndef __uint32_t_defined typedef unsigned int uint32_t; +# define __uint32_t_defined +#endif #if __WORDSIZE == 64 typedef unsigned long int uint64_t; #else -- cgit 1.4.1