reverse removal of glibc prototype changes

diff --git a/lib/bind/include/netdb.h b/lib/bind/include/netdb.h
index 49584396bba518ce9af446534d15e5f9cb5ea177..c24f3b94523ea4cfe09b89ec4a87ae8a9f75393e 100644 (file)
--- a/lib/bind/include/netdb.h
+++ b/lib/bind/include/netdb.h
@@ -86,7 +86,7 @@
 
 /*
  *      @(#)netdb.h    8.1 (Berkeley) 6/2/93
- *     $Id: netdb.h,v 1.12.2.2 2004/03/09 09:17:24 marka Exp $
+ *     $Id: netdb.h,v 1.12.2.3 2004/03/16 00:45:49 marka Exp $
  */
 
 #ifndef _NETDB_H_
@@ -410,7 +410,7 @@ int         endhostent_r __P((struct hostent_data *));
 void           endhostent_r __P((struct hostent_data *));
 #endif
 
-#ifdef __hpux
+#if defined(__hpux) || defined(__osf__)
 int            getnetbyaddr_r __P((int, int,
                                struct netent *, struct netent_data *));
 #else
@@ -452,35 +452,68 @@ void              endservent_r __P((struct servent_data *));
 #endif
 #else
  /* defined(sun) || defined(bsdi) */
+#ifdef __GLIBC__
+int gethostbyaddr_r __P((const char *, int, int, struct hostent *,
+                        char *, size_t, struct hostent **, int *));
+int gethostbyname_r __P((const char *, struct hostent *,
+                       char *, size_t, struct hostent **, int *));
+int gethostent_r __P((struct hostent *, char *, size_t,
+                        struct hostent **, int *));
+#else
 struct hostent *gethostbyaddr_r __P((const char *, int, int, struct hostent *,
                                        char *, int, int *));
 struct hostent *gethostbyname_r __P((const char *, struct hostent *,
                                        char *, int, int *));
 struct hostent *gethostent_r __P((struct hostent *, char *, int, int *));
+#endif
 void           sethostent_r __P((int));
 void           endhostent_r __P((void));
 
+#ifdef __GLIBC__
+int getnetbyname_r __P((const char *, struct netent *,
+                       char *, size_t, struct netent **, int*));
+int getnetbyaddr_r __P((unsigned long int, int, struct netent *,
+                       char *, size_t, struct netent **, int*));
+int getnetent_r __P((struct netent *, char *, size_t, struct netent **, int*));
+#else
 struct netent  *getnetbyname_r __P((const char *, struct netent *,
                                        char *, int));
 struct netent  *getnetbyaddr_r __P((long, int, struct netent *,
                                        char *, int));
 struct netent  *getnetent_r __P((struct netent *, char *, int));
+#endif
 void           setnetent_r __P((int));
 void           endnetent_r __P((void));
 
+#ifdef __GLIBC__
+int getprotobyname_r __P((const char *, struct protoent *, char *,
+                         size_t, struct protoent **));
+int getprotobynumber_r __P((int, struct protoent *, char *, size_t,
+                           struct protoent **));
+int getprotoent_r __P((struct protoent *, char *, size_t, struct protoent **));
+#else
 struct protoent        *getprotobyname_r __P((const char *,
                                struct protoent *, char *, int));
 struct protoent        *getprotobynumber_r __P((int,
                                struct protoent *, char *, int));
 struct protoent        *getprotoent_r __P((struct protoent *, char *, int));
+#endif
 void           setprotoent_r __P((int));
 void           endprotoent_r __P((void));
 
+#ifdef __GLIBC__
+int getservbyname_r __P((const char *name, const char *,
+                        struct servent *, char *, size_t, struct servent **));
+int getservbyport_r __P((int port, const char *,
+                        struct servent *, char *, size_t, struct servent **));
+int getservent_r __P((struct servent *, char *, size_t, struct servent **));
+#else
 struct servent *getservbyname_r __P((const char *name, const char *,
                                        struct servent *, char *, int));
 struct servent *getservbyport_r __P((int port, const char *,
                                        struct servent *, char *, int));
 struct servent *getservent_r __P((struct servent *, char *, int));
+#endif
 void           setservent_r __P((int));
 void           endservent_r __P((void));