===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/include/netdb.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/include/netdb.h	2005/06/08 18:32:32	1.24
--- src/include/netdb.h	2005/12/13 00:35:22	1.25
***************
*** 1,4 ****
! /*	$OpenBSD: netdb.h,v 1.24 2005/06/08 18:32:32 millert Exp $	*/
  
  /*
   * ++Copyright++ 1980, 1983, 1988, 1993
--- 1,4 ----
! /*	$OpenBSD: netdb.h,v 1.25 2005/12/13 00:35:22 millert Exp $	*/
  
  /*
   * ++Copyright++ 1980, 1983, 1988, 1993
***************
*** 88,96 ****
  #define _NETDB_H_
  
  #include <sys/param.h>
- #if (!defined(BSD)) || (BSD < 199306)
- # include <sys/bitypes.h>
- #endif
  #include <sys/cdefs.h>
  
  #define	_PATH_HEQUIV	"/etc/hosts.equiv"
--- 88,93 ----
***************
*** 236,242 ****
  	struct rdatainfo	*rri_sigs;	/* individual signatures */
  };
  
! #ifndef POSIX_SOURCE
  struct servent_data {
  	void *fp;
  	char **aliases;
--- 233,239 ----
  	struct rdatainfo	*rri_sigs;	/* individual signatures */
  };
  
! #if __BSD_VISIBLE
  struct servent_data {
  	void *fp;
  	char **aliases;
***************
*** 258,268 ****
  void		endhostent(void);
  void		endnetent(void);
  void		endprotoent(void);
! #ifndef POSIX_SOURCE
  void		endprotoent_r(struct protoent_data *);
  #endif
  void		endservent(void);
! #ifndef POSIX_SOURCE
  void		endservent_r(struct servent_data *);
  #endif
  struct hostent	*gethostbyaddr(const void *, socklen_t, int);
--- 255,265 ----
  void		endhostent(void);
  void		endnetent(void);
  void		endprotoent(void);
! #if __BSD_VISIBLE
  void		endprotoent_r(struct protoent_data *);
  #endif
  void		endservent(void);
! #if __BSD_VISIBLE
  void		endservent_r(struct servent_data *);
  #endif
  struct hostent	*gethostbyaddr(const void *, socklen_t, int);
***************
*** 275,281 ****
  struct protoent	*getprotobyname(const char *);
  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 *,
--- 272,278 ----
  struct protoent	*getprotobyname(const char *);
  struct protoent	*getprotobynumber(int);
  struct protoent	*getprotoent(void);
! #if __BSD_VISIBLE
  int		getprotobyname_r(const char *, struct protoent *,
  		    struct protoent_data *);
  int		getprotobynumber_r(int, struct protoent *,
***************
*** 285,291 ****
  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 *,
--- 282,288 ----
  struct servent	*getservbyname(const char *, const char *);
  struct servent	*getservbyport(int, const char *);
  struct servent	*getservent(void);
! #if __BSD_VISIBLE
  int		getservbyname_r(const char *, const char *, struct servent *,
  		    struct servent_data *);
  int		getservbyport_r(int, const char *, struct servent *,
***************
*** 298,308 ****
  /* void		sethostfile(const char *); */
  void		setnetent(int);
  void		setprotoent(int);
! #ifndef POSIX_SOURCE
  void		setprotoent_r(int, struct protoent_data *);
  #endif
  void		setservent(int);
! #ifndef POSIX_SOURCE
  void		setservent_r(int, struct servent_data *);
  #endif
  
--- 295,305 ----
  /* void		sethostfile(const char *); */
  void		setnetent(int);
  void		setprotoent(int);
! #if __BSD_VISIBLE
  void		setprotoent_r(int, struct protoent_data *);
  #endif
  void		setservent(int);
! #if __BSD_VISIBLE
  void		setservent_r(int, struct servent_data *);
  #endif