===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/netdb.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -c -r1.20 -r1.21
*** src/include/netdb.h	2004/10/17 20:24:23	1.20
--- src/include/netdb.h	2004/10/25 03:09:01	1.21
***************
*** 1,4 ****
! /*	$OpenBSD: netdb.h,v 1.20 2004/10/17 20:24:23 millert Exp $	*/
  
  /*
   * ++Copyright++ 1980, 1983, 1988, 1993
--- 1,4 ----
! /*	$OpenBSD: netdb.h,v 1.21 2004/10/25 03:09:01 millert Exp $	*/
  
  /*
   * ++Copyright++ 1980, 1983, 1988, 1993
***************
*** 238,247 ****
  };
  
  #ifndef POSIX_SOURCE
- struct __sFILE;
- 
  struct servent_data {
! 	struct __sFILE *fp;
  	char **aliases;
  	int maxaliases;
  	int stayopen;
--- 238,245 ----
  };
  
  #ifndef POSIX_SOURCE
  struct servent_data {
! 	void *fp;
  	char **aliases;
  	int maxaliases;
  	int stayopen;
***************
*** 249,255 ****
  };
  
  struct protoent_data {
! 	struct __sFILE *fp;
  	char **aliases;
  	int maxaliases;
  	int stayopen;
--- 247,253 ----
  };
  
  struct protoent_data {
! 	void *fp;
  	char **aliases;
  	int maxaliases;
  	int stayopen;
***************
*** 279,299 ****
  struct protoent	*getprotobynumber(int);
  struct protoent	*getprotoent(void);
  #ifndef POSIX_SOURCE
! struct protoent	*getprotobyname_r(const char *, struct protoent *,
  		    struct protoent_data *);
! struct protoent	*getprotobynumber_r(int, struct protoent *,
  		    struct protoent_data *);
! struct protoent	*getprotoent_r(struct protoent *, struct protoent_data *);
  #endif
  struct servent	*getservbyname(const char *, const char *);
  struct servent	*getservbyport(int, const char *);
  struct servent	*getservent(void);
  #ifndef POSIX_SOURCE
! struct servent	*getservbyname_r(const char *, const char *, struct servent *,
  		    struct servent_data *);
! struct servent	*getservbyport_r(int, const char *, struct servent *,
  		    struct servent_data *);
! struct servent	*getservent_r(struct servent *, struct servent_data *);
  #endif
  void		herror(const char *);
  const char	*hstrerror(int);
--- 277,297 ----
  struct protoent	*getprotobynumber(int);
  struct protoent	*getprotoent(void);
  #ifndef POSIX_SOURCE
! int		getprotobyname_r(const char *, struct protoent *,
  		    struct protoent_data *);
! int		getprotobynumber_r(int, struct protoent *,
  		    struct protoent_data *);
! int		getprotoent_r(struct protoent *, struct protoent_data *);
  #endif
  struct servent	*getservbyname(const char *, const char *);
  struct servent	*getservbyport(int, const char *);
  struct servent	*getservent(void);
  #ifndef POSIX_SOURCE
! int		getservbyname_r(const char *, const char *, struct servent *,
  		    struct servent_data *);
! int		getservbyport_r(int, const char *, struct servent *,
  		    struct servent_data *);
! int		getservent_r(struct servent *, struct servent_data *);
  #endif
  void		herror(const char *);
  const char	*hstrerror(int);